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

wahwah at users.sourceforge.net wahwah at users.sourceforge.net
Sat Nov 7 15:16:14 CET 2009 

Revision: 7157
          http://gar.svn.sourceforge.net/gar/?rev=7157&view=rev
Author:   wahwah
Date:     2009-11-07 14:16:14 +0000 (Sat, 07 Nov 2009)

Log Message:
-----------
mysql5-5.0.x: Fixing a problem with the runtime library path.

Modified Paths:
--------------
    csw/mgar/pkg/mysql5/branches/mysql-5.0.x/Makefile
    csw/mgar/pkg/mysql5/branches/mysql-5.0.x/checksums
    csw/mgar/pkg/mysql5/branches/mysql-5.0.x/files/CSWmysql5.postinstall
    csw/mgar/pkg/mysql5/branches/mysql-5.0.x/files/quick_start-csw

Property Changed:
----------------
    csw/mgar/pkg/mysql5/branches/mysql-5.0.x/files/CSWmysql5.postinstall
    csw/mgar/pkg/mysql5/branches/mysql-5.0.x/files/CSWmysql5.preinstall

Modified: csw/mgar/pkg/mysql5/branches/mysql-5.0.x/Makefile
===================================================================
--- csw/mgar/pkg/mysql5/branches/mysql-5.0.x/Makefile	2009-11-06 23:11:06 UTC (rev 7156)
+++ csw/mgar/pkg/mysql5/branches/mysql-5.0.x/Makefile	2009-11-07 14:16:14 UTC (rev 7157)
@@ -72,7 +72,6 @@
 
 CSWmysql5devel_programs += mysql_config
 
-
 PKGFILES_CSWmysql5bench   = $(prefix)/sql-bench.*
 PKGFILES_CSWmysql5client  = $(bindir)
 PKGFILES_CSWmysql5client += $(foreach bin_name,$(CSWmysql5client_programs),$(call baseisadirs,$(bindir),$(bin_name)))
@@ -87,22 +86,6 @@
 PKGFILES_CSWmysql5devel  += $(prefix)/include.*
 PKGFILES_CSWmysql5devel  += /opt/csw/include/mysql
 
-# -/opt/csw/include/mysql --> ../mysql5/include/mysql
-# -/opt/csw/mysql5/bin
-# -/opt/csw/mysql5/bin/mysql_config
-#
-# /opt/csw/bin/mysql_config=../mysql5/bin/mysql_config
-# /opt/csw/mysql5/bin/amd64/mysql_config 0755 root bin
-# /opt/csw/mysql5/bin/i386/mysql_config=/opt/csw/mysql5/bin/mysql_config 0755 root bin
-# /opt/csw/mysql5/bin/mysql_config=/opt/csw/bin/isaexec 0755 root bin
-# /opt/csw/mysql5/share/man/man1/mysql_config.1 0644 root bin
-
-
-# work/build-global/CSWmysql5client.prototype:s none /opt/csw/bin/mysql_config=../mysql5/bin/mysql_config
-# work/build-global/CSWmysql5client.prototype:f none /opt/csw/mysql5/bin/amd64/mysql_config 0755 root bin
-# work/build-global/CSWmysql5client.prototype:f none /opt/csw/mysql5/bin/mysql_config 0755 root bin
-# work/build-global/CSWmysql5client.prototype:f none /opt/csw/mysql5/share/man/man1/mysql_config.1 0644 root bin
-
 PKGFILES_CSWmysql5rt      = $(prefix)/lib/.*\.so.*
 PKGFILES_CSWmysql5test    = $(prefix)/mysql-test.*
 
@@ -119,7 +102,7 @@
 DISTFILES += CSWmysql5.postinstall
 DISTFILES += cswusergroup
 
-UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.gz
+UFILES_REGEX = mysql-(\d+(?:\.\d+)*).tar.gz
 
 REQUIRED_PKGS = CSWncurses CSWzlib
 PREREQUISITE_PKGS = $(REQUIRED_PKGS)
@@ -127,6 +110,16 @@
 EXTRA_CFLAGS = -mt -D_POSIX_C_SOURCE=199506L -D__EXTENSIONS__
 EXTRA_CXXFLAGS = -mt -D_POSIX_C_SOURCE=199506L -D__EXTENSIONS__
 
+# Without this EXTRA_LD_OPTIONS setting, /opt/csw/bin/mysql fails with a shared
+# library not found.  EXTRA_LIB was tried too, but did not work, as the -R path
+# ended up with having two $ISALIST tokens.
+#
+# Without this setting it looks for:
+# /opt/csw/mysql5/lib/amd64/libmysqlclient.so.15
+# The library is at:
+# /opt/csw/mysql5/lib/amd64/mysql/libmysqlclient.so.15
+EXTRA_LD_OPTIONS  = -R/opt/csw/mysql5/lib/\$$ISALIST/mysql
+
 # Set ./configure options
 CONFIGURE_ARGS  = $(DIRPATHS)
 CONFIGURE_ARGS += --disable-assembler

Modified: csw/mgar/pkg/mysql5/branches/mysql-5.0.x/checksums
===================================================================
--- csw/mgar/pkg/mysql5/branches/mysql-5.0.x/checksums	2009-11-06 23:11:06 UTC (rev 7156)
+++ csw/mgar/pkg/mysql5/branches/mysql-5.0.x/checksums	2009-11-07 14:16:14 UTC (rev 7157)
@@ -2,11 +2,11 @@
 1414d06fab1530484a508927a0de4154  0002-cast-user_info-pw_gid-to-gid_t.patch
 5415f365f1b0f7a179d1efc25f45bbee  0003-OpenCSW-perl-for-tests.patch
 8ab232cd4d232b3cda3bbced93f80237  0004-basedir-and-datadir-in-the-cnf-files.patch
-9b5511de728fec4394eca7dd0097fb43  CSWmysql5.postinstall
+d5272c16bcc250df520ffe44bd60ef2a  CSWmysql5.postinstall
 cc2a219abbe7dc6049775cff070a27a5  CSWmysql5.preinstall
 e691b0cf00a3925ac55c1844045d6e30  ChangeLog
 e42afb5ec1b1ab02d2ec3b46d0922636  README.CSW
 aaca748fc044834e71ad544ab293c494  cswmysql5
 67228e1f096fe08a94f4267439a4ec36  cswusergroup
 671348f1a5b078da9ca76f97e1fda325  mysql-5.0.84.tar.gz
-fe747c88f7e6bd6a9636ba8ef2e96871  quick_start-csw
+6342b90f82fbcdb85cd7f8269c0f860d  quick_start-csw

Modified: csw/mgar/pkg/mysql5/branches/mysql-5.0.x/files/CSWmysql5.postinstall
===================================================================
--- csw/mgar/pkg/mysql5/branches/mysql-5.0.x/files/CSWmysql5.postinstall	2009-11-06 23:11:06 UTC (rev 7156)
+++ csw/mgar/pkg/mysql5/branches/mysql-5.0.x/files/CSWmysql5.postinstall	2009-11-07 14:16:14 UTC (rev 7157)
@@ -5,7 +5,8 @@
 
 MYSQLDATADIR=/var/opt/csw/mysql5
 if [ ! -d "${MYSQLDATADIR}/mysql" ] ; then
-  echo "No database directory found in the default location."
+  echo "No database directory found in the default location:"
+  echo "${MYSQLDATADIR}/mysql"
   echo "If you need to build the initial database directory,"
   echo "  see /opt/csw/mysql5/share/mysql/quick_start-csw"
   echo "If you are using a non-default database directory location,"


Property changes on: csw/mgar/pkg/mysql5/branches/mysql-5.0.x/files/CSWmysql5.postinstall
___________________________________________________________________
Added: svn:keywords
   + Id


Property changes on: csw/mgar/pkg/mysql5/branches/mysql-5.0.x/files/CSWmysql5.preinstall
___________________________________________________________________
Added: svn:keywords
   + Id

Modified: csw/mgar/pkg/mysql5/branches/mysql-5.0.x/files/quick_start-csw
===================================================================
--- csw/mgar/pkg/mysql5/branches/mysql-5.0.x/files/quick_start-csw	2009-11-06 23:11:06 UTC (rev 7156)
+++ csw/mgar/pkg/mysql5/branches/mysql-5.0.x/files/quick_start-csw	2009-11-07 14:16:14 UTC (rev 7157)
@@ -102,7 +102,11 @@
 echo "Creating MySQL core database in $MYSQLD_DATADIR"
 echo
 echo "###  The following messages are from mysql_install_db."
-$BASEDIR/bin/mysql_install_db --defaults-extra-file=$DEFAULTS_FILE --user=$MYSQLD_USER --basedir=$BASEDIR --datadir=$MYSQLD_DATADIR
+$BASEDIR/bin/mysql_install_db \
+    --defaults-extra-file=$DEFAULTS_FILE \
+    --user=$MYSQLD_USER \
+    --basedir=$BASEDIR \
+    --datadir=$MYSQLD_DATADIR
 
 #
 # Fix permissions on the data directory
@@ -125,7 +129,7 @@
 echo "  for starting CSWmysql5."
 smf=no
 if [ -f /usr/sbin/svccfg -a -f /usr/sbin/svcadm ] ; then smf=yes ; fi
-if [ $smf = yes ] 
+if [ $smf = yes ]
 then
     echo "To start mysqld; run \`svcadm enable cswmysql5\` on Solaris 10 or later"
 else


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