[csw-devel] SF.net SVN: gar:[15819] csw/mgar/pkg/mysql5/branches/mysql-5.1.x

wahwah at users.sourceforge.net wahwah at users.sourceforge.net
Sat Oct 1 00:08:08 CEST 2011


Revision: 15819
          http://gar.svn.sourceforge.net/gar/?rev=15819&view=rev
Author:   wahwah
Date:     2011-09-30 22:08:08 +0000 (Fri, 30 Sep 2011)
Log Message:
-----------
pkg/mysql5/branches/mysql-5.1.x: What's up with CFLAGS?

Modified Paths:
--------------
    csw/mgar/pkg/mysql5/branches/mysql-5.1.x/Makefile
    csw/mgar/pkg/mysql5/branches/mysql-5.1.x/checksums

Added Paths:
-----------
    csw/mgar/pkg/mysql5/branches/mysql-5.1.x/files/0004-Use-OpenCSW-Perl-for-testing.patch
    csw/mgar/pkg/mysql5/branches/mysql-5.1.x/files/0004-looking-for-ps-use-basename-0.patch

Modified: csw/mgar/pkg/mysql5/branches/mysql-5.1.x/Makefile
===================================================================
--- csw/mgar/pkg/mysql5/branches/mysql-5.1.x/Makefile	2011-09-30 20:55:26 UTC (rev 15818)
+++ csw/mgar/pkg/mysql5/branches/mysql-5.1.x/Makefile	2011-09-30 22:08:08 UTC (rev 15819)
@@ -37,16 +37,33 @@
 
 MYSQL_LIB_VER = 16
 
+PACKAGES += CSWmysql-dev
+SPKG_DESC_CSWmysql-dev = MySQL development files
+PKGFILES_CSWmysql-dev = $(PKGFILES_DEVEL)
+RUNTIME_DEP_PKGS_CSWmysql-dev += CSWlibmysqlclient-r$(MYSQL_LIB_VER)
+RUNTIME_DEP_PKGS_CSWmysql-dev += CSWlibmysqlclient$(MYSQL_LIB_VER)
+CSWmysql-dev_programs += mysql_config
+PKGFILES_CSWmysql-dev  += $(foreach bin_name,$(CSWmysql-dev_programs),$(call baseisadirs,$(bindir),$(bin_name)))
+PKGFILES_CSWmysql-dev  += $(foreach bin_name,$(CSWmysql-dev_programs),$(mandir)/man1/$(bin_name)\.1)
+PKGFILES_CSWmysql-dev  += $(foreach bin_name,$(CSWmysql-dev_programs),/opt/csw/bin/$(bin_name))
+PKGFILES_CSWmysql-dev  += $(foreach bin_name,$(CSWmysql-dev_programs),/opt/csw/sbin/$(bin_name))
+PKGFILES_CSWmysql-dev  += $(mandir)/man1/mysql_config\.1
+PKGFILES_CSWmysql-dev  += $(prefix)/include.*
+PKGFILES_CSWmysql-dev  += /opt/csw/include/mysql
+CHECKPKG_OVERRIDES_CSWmysql-dev += file-with-bad-content|/usr/local|root/opt/csw/mysql5/share/man/man1/mysql_config.1
+
 PACKAGES += CSWlibmysqlclient$(MYSQL_LIB_VER)
 PKGFILES_CSWlibmysqlclient$(MYSQL_LIB_VER) += $(call baseisadirs,$(libdir),libmysqlclient\.so\.$(MYSQL_LIB_VER)(\.\d+)*)
 SPKG_DESC_CSWlibmysqlclient$(MYSQL_LIB_VER) += MySQL $(BASE_VERSION) client library, libmysqlclient.so.$(MYSQL_LIB_VER)
 RUNTIME_DEP_PKGS_CSWlibmysqlclient$(MYSQL_LIB_VER) += CSWlibz1
+RUNTIME_DEP_PKGS_CSWlibmysqlclient$(MYSQL_LIB_VER) += CSWosslrt
 OBSOLETED_BY_CSWlibmysqlclient$(MYSQL_LIB_VER) += CSW$(NAME)rt
 
 PACKAGES += CSWlibmysqlclient-r$(MYSQL_LIB_VER)
 PKGFILES_CSWlibmysqlclient-r$(MYSQL_LIB_VER) += $(call baseisadirs,$(libdir),libmysqlclient_r\.so\.$(MYSQL_LIB_VER)(\.\d+)*)
 SPKG_DESC_CSWlibmysqlclient-r$(MYSQL_LIB_VER) += MySQL $(BASE_VERSION) client library, libmysqlclient_r.so.$(MYSQL_LIB_VER)
 RUNTIME_DEP_PKGS_CSWlibmysqlclient-r$(MYSQL_LIB_VER) += CSWlibz1
+RUNTIME_DEP_PKGS_CSWlibmysqlclient-r$(MYSQL_LIB_VER) += CSWosslrt
 OBSOLETED_BY_CSWlibmysqlclient-r$(MYSQL_LIB_VER) += CSW$(NAME)rt
 
 PACKAGES += CSW$(NAME)client
@@ -91,55 +108,37 @@
 RUNTIME_DEP_PKGS_CSW$(NAME) += CSWosslrt
 
 PACKAGES += CSW$(NAME)bench
-PACKAGES += CSW$(NAME)devel
 PACKAGES += CSW$(NAME)test
 
 PATCHFILES  = 0001-Use-libc-not-libcrypt.patch
 PATCHFILES += 0002-cast-user_info-pw_gid-to-gid_t.patch
 # PATCHFILES += 0003-OpenCSW-perl-for-tests.patch
 PATCHFILES += 0004-var-opt-csw-mysql51-for-datadir-in-my-.cnf.patch
-PATCHFILES += 0004-Use-OpenCSW-Perl-for-testing.patch
+# PATCHFILES += 0004-Use-OpenCSW-Perl-for-testing.patch
 PATCHFILES += 0004-looking-for-ps-use-basename-0.patch
 
 SPKG_DESC_CSW$(NAME)bench  = MySQL $(BASE_VERSION) benchmarking
-SPKG_DESC_CSW$(NAME)devel  = MySQL $(BASE_VERSION) header files
 SPKG_DESC_CSW$(NAME)test   = MySQL $(BASE_VERSION) testing files
 
 CATALOGNAME_CSW$(NAME)bench  = $(NAME)bench
-CATALOGNAME_CSW$(NAME)devel  = $(NAME)devel
 CATALOGNAME_CSW$(NAME)test   = $(NAME)test
 
-COMMON_CFLAGS = -fsimple=1 -ftrap=%none -xbuiltin=%all -xlibmil -xlibmopt
+# COMMON_EXTRA_FLAGS += -fsimple=1 -ftrap=%none -xbuiltin=%all -xlibmil -xlibmopt
 
-EXTRA_CFLAGS = $(EXTRA_CFLAGS_$(GARCH)) -Xa -fast -native -xnorunpath
-EXTRA_CFLAGS_sparc = -xO4 -xstrconst $(COMMON_CFLAGS)
-EXTRA_CFLAGS_i386 = -xO3 -nofstore -xregs=no%frameptr $(COMMON_CFLAGS)
+# EXTRA_CFLAGS_sparc = -xO4 -xstrconst $(COMMON_EXTRA_FLAGS)
+# EXTRA_CFLAGS_i386 = -xO3 -nofstore -xregs=no%frameptr $(COMMON_EXTRA_FLAGS)
+# EXTRA_CFLAGS = $(EXTRA_CFLAGS_$(GARCH)) -Xa -fast -native -xnorunpath
 
-EXTRA_CXXFLAGS = $(EXTRA_CXXFLAGS_$(GARCH)) -noex -mt -norunpath
-EXTRA_CXXFLAGS_sparc = -xO4 $(COMMON_CFLAGS)
-EXTRA_CXXFLAGS_i386 = -xO3 -nofstore -xregs=no%frameptr $(COMMON_CFLAGS)
+# EXTRA_CXXFLAGS_sparc = -xO4 $(COMMON_EXTRA_FLAGS)
+# EXTRA_CXXFLAGS_i386 = -xO3 -nofstore -xregs=no%frameptr $(COMMON_EXTRA_FLAGS)
+# EXTRA_CXXFLAGS = $(EXTRA_CXXFLAGS_$(GARCH)) -noex -mt -norunpath
 
 ARCHALL_CSW$(NAME)bench = 1
-ARCHALL_CSW$(NAME)test  = 1
 
-CSW$(NAME)devel_programs += mysql_config
-
 # Enable 64 bits build
 BUILD64 = 1
 
 PKGFILES_CSW$(NAME)bench   = $(prefix)/sql-bench.*
-PKGFILES_CSW$(NAME)client  = $(bindir)
-PKGFILES_CSW$(NAME)client += $(foreach bin_name,$(CSW$(NAME)client_programs),$(call baseisadirs,$(bindir),$(bin_name)))
-PKGFILES_CSW$(NAME)client += $(foreach bin_name,$(CSW$(NAME)client_programs),$(mandir)/man1/$(bin_name)\.1)
-PKGFILES_CSW$(NAME)client += $(foreach bin_name,$(CSW$(NAME)client_programs),/opt/csw/bin/$(bin_name))
-PKGFILES_CSW$(NAME)client += $(foreach bin_name,$(CSW$(NAME)client_programs),/opt/csw/sbin/$(bin_name))
-PKGFILES_CSW$(NAME)devel  += $(foreach bin_name,$(CSW$(NAME)devel_programs),$(call baseisadirs,$(bindir),$(bin_name)))
-PKGFILES_CSW$(NAME)devel  += $(foreach bin_name,$(CSW$(NAME)devel_programs),$(mandir)/man1/$(bin_name)\.1)
-PKGFILES_CSW$(NAME)devel  += $(foreach bin_name,$(CSW$(NAME)devel_programs),/opt/csw/bin/$(bin_name))
-PKGFILES_CSW$(NAME)devel  += $(foreach bin_name,$(CSW$(NAME)devel_programs),/opt/csw/sbin/$(bin_name))
-PKGFILES_CSW$(NAME)devel  += $(mandir)/man1/mysql_config\.1
-PKGFILES_CSW$(NAME)devel  += $(prefix)/include.*
-PKGFILES_CSW$(NAME)devel  += /opt/csw/include/mysql
 
 PKGFILES_CSW$(NAME)test    = $(prefix)/mysql-test.*
 
@@ -206,6 +205,16 @@
 PROTOTYPE_PERMS_dbdir = 0700
 PROTOTYPE_CLASS_dbdir = ugfiles
 
+CHECKPKG_OVERRIDES_CSW$(NAME) += surplus-dependency|CSW$(NAME)client
+CHECKPKG_OVERRIDES_CSW$(NAME)bench += file-with-bad-content
+CHECKPKG_OVERRIDES_CSW$(NAME)bench += surplus-dependency|CSW$(NAME)
+CHECKPKG_OVERRIDES_CSW$(NAME)test += file-with-bad-content
+CHECKPKG_OVERRIDES_CSW$(NAME)test += surplus-dependency|CSW$(NAME)
+
+CHECKPKG_OVERRIDES_CSW$(NAME)client += file-with-bad-content|/usr/local|root/opt/csw/mysql5/share/man/man1/mysqlaccess.1
+# This could be reviewed.
+CHECKPKG_OVERRIDES_CSW$(NAME) += file-with-bad-content
+
 EXECUTABLES += comp_err
 EXECUTABLES += innochecksum
 EXECUTABLES += msql2mysql
@@ -264,7 +273,7 @@
 
 include gar/category.mk
 
-CFLAGS := $(filter-out -I%,$(CFLAGS))
+# CFLAGS := $(filter-out -I%,$(CFLAGS))
 
 test-custom:
 	alias sh=/usr/bin/bash;                           \

Modified: csw/mgar/pkg/mysql5/branches/mysql-5.1.x/checksums
===================================================================
--- csw/mgar/pkg/mysql5/branches/mysql-5.1.x/checksums	2011-09-30 20:55:26 UTC (rev 15818)
+++ csw/mgar/pkg/mysql5/branches/mysql-5.1.x/checksums	2011-09-30 22:08:08 UTC (rev 15819)
@@ -1,12 +1 @@
-8940e0673e599689932e94fec906aec9  0001-Use-libc-not-libcrypt.patch
-1414d06fab1530484a508927a0de4154  0002-cast-user_info-pw_gid-to-gid_t.patch
-5415f365f1b0f7a179d1efc25f45bbee  0003-OpenCSW-perl-for-tests.patch
-0cea0d771ff324ccdd31de4b6311b12f  0004-var-opt-csw-mysql51-for-datadir-in-my-.cnf.patch
-a1008df3aee0528449eb18f39bc21603  CSWmysql51.postinstall
-fe58fe0af20a51143893495b56964682  CSWmysql51.preinstall
-e691b0cf00a3925ac55c1844045d6e30  ChangeLog
-59f9d5aa04d8e8d3806bec666d01e096  README.CSW
-22a8164a101fa7e4be35fd6aa674d272  cswmysql51
-e3000190fef8aa4cfbd527bb5e40d9a6  cswusergroup
-a90d87a71fa3c23dff6d78afc8e3184c  mysql-5.1.49.tar.gz
-028a9f9167edee23d2e946239af5a2fb  quick_start-csw
+1e89816164692f44f768024db4bc05f6  mysql-5.1.59.tar.gz

Added: csw/mgar/pkg/mysql5/branches/mysql-5.1.x/files/0004-Use-OpenCSW-Perl-for-testing.patch
===================================================================
--- csw/mgar/pkg/mysql5/branches/mysql-5.1.x/files/0004-Use-OpenCSW-Perl-for-testing.patch	                        (rev 0)
+++ csw/mgar/pkg/mysql5/branches/mysql-5.1.x/files/0004-Use-OpenCSW-Perl-for-testing.patch	2011-09-30 22:08:08 UTC (rev 15819)
@@ -0,0 +1,33 @@
+From 2b227bddcd0cd2f8f2fb299ecd6c6957cb52c496 Mon Sep 17 00:00:00 2001
+From: Maciej Blizinski <maciej at opencsw.org>
+Date: Fri, 11 Mar 2011 01:22:51 +0100
+Subject: [PATCH] Use OpenCSW Perl for testing
+
+---
+ mysql-test/lib/v1/mysql-test-run.pl |    2 +-
+ mysql-test/mysql-test-run.pl        |    2 +-
+ 2 files changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/mysql-test/lib/v1/mysql-test-run.pl b/mysql-test/lib/v1/mysql-test-run.pl
+index 5d06d9c..a1205cf 100755
+--- a/mysql-test/lib/v1/mysql-test-run.pl
++++ b/mysql-test/lib/v1/mysql-test-run.pl
+@@ -1,4 +1,4 @@
+-#!/usr/bin/perl
++#!/opt/csw/bin/perl
+ # -*- cperl -*-
+ 
+ #
+diff --git a/mysql-test/mysql-test-run.pl b/mysql-test/mysql-test-run.pl
+index 2301b24..754e426 100755
+--- a/mysql-test/mysql-test-run.pl
++++ b/mysql-test/mysql-test-run.pl
+@@ -1,4 +1,4 @@
+-#!/usr/bin/perl
++#!/opt/csw/bin/perl
+ # -*- cperl -*-
+ 
+ # Copyright (c) 2004, 2010, Oracle and/or its affiliates. All rights reserved.
+-- 
+1.7.3.2
+

Added: csw/mgar/pkg/mysql5/branches/mysql-5.1.x/files/0004-looking-for-ps-use-basename-0.patch
===================================================================
--- csw/mgar/pkg/mysql5/branches/mysql-5.1.x/files/0004-looking-for-ps-use-basename-0.patch	                        (rev 0)
+++ csw/mgar/pkg/mysql5/branches/mysql-5.1.x/files/0004-looking-for-ps-use-basename-0.patch	2011-09-30 22:08:08 UTC (rev 15819)
@@ -0,0 +1,48 @@
+From 111c7574ea02e17df8b2aff8e1b94d6118024f7b Mon Sep 17 00:00:00 2001
+From: Maciej Blizinski <maciej at opencsw.org>
+Date: Wed, 28 Sep 2011 23:26:47 +0200
+Subject: [PATCH] looking for ps, use `basename $0`
+
+Upstream bug filed:
+http://bugs.mysql.com/bug.php?id=62567
+
+---
+ configure.in |   10 +++++-----
+ 1 files changed, 5 insertions(+), 5 deletions(-)
+
+diff --git a/configure.in b/configure.in
+index cfae77d..8e6dd43 100644
+--- a/configure.in
++++ b/configure.in
+@@ -518,23 +518,23 @@ AC_PATH_PROG(PS, ps, ps)
+ AC_MSG_CHECKING("how to check if pid exists")
+ PS=$ac_cv_path_PS
+ # Linux style
+-if $PS wwwp $$ 2> /dev/null | grep -- "$0" > /dev/null
++if $PS wwwp $$ 2> /dev/null | grep -- "`basename $0`" > /dev/null
+ then
+   FIND_PROC="$PS wwwp \$\$PID | grep -v \" grep\" | grep -v mysqld_safe | grep -- \"\$\$MYSQLD\" > /dev/null"
+ # Solaris
+-elif $PS -fp $$ 2> /dev/null | grep -- $0 > /dev/null
++elif $PS -fp $$ 2> /dev/null | grep -- `basename $0` > /dev/null
+ then
+   FIND_PROC="$PS -p \$\$PID | grep -v \" grep\" | grep -v mysqld_safe | grep -- \"\$\$MYSQLD\" > /dev/null"
+ # BSD style
+-elif $PS -uaxww 2> /dev/null | grep -- $0 > /dev/null
++elif $PS -uaxww 2> /dev/null | grep -- `basename $0` > /dev/null
+ then
+   FIND_PROC="$PS -uaxww | grep -v \" grep\" | grep -v mysqld_safe | grep -- \"\$\$MYSQLD\" | grep \" \$\$PID \" > /dev/null"
+ # SysV style
+-elif $PS -ef 2> /dev/null | grep -- $0 > /dev/null
++elif $PS -ef 2> /dev/null | grep -- `basename $0` > /dev/null
+ then
+   FIND_PROC="$PS -ef | grep -v \" grep\" | grep -v mysqld_safe | grep -- \"\$\$MYSQLD\" | grep \" \$\$PID \" > /dev/null"
+ # Do anybody use this?
+-elif $PS $$ 2> /dev/null | grep -- $0 > /dev/null
++elif $PS $$ 2> /dev/null | grep -- `basename $0` > /dev/null
+ then
+   FIND_PROC="$PS \$\$PID | grep -v \" grep\" | grep -v mysqld_safe | grep -- \"\$\$MYSQLD\" > /dev/null"
+ else
+-- 
+1.7.6.1
+

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.



More information about the devel mailing list