[arch-commits] Commit in mysql/repos (4 files)

Douglas Soares de Andrade douglas at archlinux.org
Wed Mar 25 00:43:02 UTC 2009


    Date: Tuesday, March 24, 2009 @ 20:43:02
  Author: douglas
Revision: 31185

Merged revisions 31144,31184 via svnmerge from 
svn+ssh://archlinux.org/srv/svn-packages/mysql/trunk

........
  r31144 | douglas | 2009-03-24 17:11:21 -0300 (Ter, 24 Mar 2009) | 1 line
  
  Forgot to add this patch before commiting.
........
  r31184 | douglas | 2009-03-24 21:42:18 -0300 (Ter, 24 Mar 2009) | 2 lines
  
  upgpkg: mysql 5.1.32-2
      Fixing the order the modules are built in the Makefile (it was breaking due to wrong order) - it built for me because i did several compiles without erasing the pkg dir.
........

Added:
  mysql/repos/testing-i686/mysql-fix-libs.patch
    (from rev 31184, mysql/trunk/mysql-fix-libs.patch)
Modified:
  mysql/repos/testing-i686/	(properties)
  mysql/repos/testing-i686/PKGBUILD
  mysql/repos/testing-i686/mysql-no-clients.patch

------------------------+
 PKGBUILD               |   23 +++++++++--------------
 mysql-fix-libs.patch   |   36 ++++++++++++++++++++++++++++++++++++
 mysql-no-clients.patch |    4 ++--
 3 files changed, 47 insertions(+), 16 deletions(-)


Property changes on: mysql/repos/testing-i686
___________________________________________________________________
Modified: svnmerge-integrated
   - /mysql/trunk:1-31074
   + /mysql/trunk:1-31184

Modified: testing-i686/PKGBUILD
===================================================================
--- testing-i686/PKGBUILD	2009-03-25 00:42:18 UTC (rev 31184)
+++ testing-i686/PKGBUILD	2009-03-25 00:43:02 UTC (rev 31185)
@@ -4,7 +4,7 @@
 
 pkgname=mysql
 pkgver=5.1.32
-pkgrel=1
+pkgrel=2
 pkgdesc="A fast SQL database server"
 arch=(i686 x86_64)
 backup=(etc/my.cnf etc/conf.d/mysqld)
@@ -37,20 +37,12 @@
   pushd include || return
   make || return 1
   popd
-
-  pushd libmysql                                                                                                                 
-  make link_sources get_password.lo || return                                                                                    
+    
+  pushd libmysql
+  make link_sources get_password.lo || return
   popd
-
-  pushd storage || return
+  
   make || return 1
-  popd
-
-  # fixes
-  #sed -i -e 's/^.*HAVE_GETHOSTBYNAME_R_GLIBC2_STYLE.*$/#define\ HAVE_GETHOSTBYNAME_R_GLIBC2_STYLE/g' include/config.h || return 1
-  #sed -i -e 's/size_socket/socklen_t/g' sql/mysqld.cc || return 1
-
-  make || return 1
   make DESTDIR=${startdir}/pkg install
 
   rm -rf $pkgdir/usr/{mysql-test,sql-bench,lib,include}
@@ -58,9 +50,12 @@
   install -D -m755 ../mysqld ${startdir}/pkg/etc/rc.d/mysqld
   install -D -m644 ../mysqld.conf.d ${startdir}/pkg/etc/conf.d/mysqld
   rm -f ${startdir}/pkg/usr/bin/mysql_config
+
+  # Cleanup files provided by the other packages
+  rm -rf $pkgdir/usr/{include,lib}
 }
 md5sums=('f2d14b5e3b9d50b809c9b9985e4513b7'
-         'b4c9effb2ebf85a6aae9e94f5bbef344'
+         '8dce7e2b9f1f6ed6eca8bd62144bad0a'
          'd1921e85821a66196c24ef6e5346b572'
          '247e9fa664bccaca62ca0e42a6cfae20'
          '0ee035590ffc61d32de994f461fd2bd2'

Copied: mysql/repos/testing-i686/mysql-fix-libs.patch (from rev 31184, mysql/trunk/mysql-fix-libs.patch)
===================================================================
--- testing-i686/mysql-fix-libs.patch	                        (rev 0)
+++ testing-i686/mysql-fix-libs.patch	2009-03-25 00:43:02 UTC (rev 31185)
@@ -0,0 +1,36 @@
+diff -Naur mysql-5.1.32/client/Makefile.in mysql-5.1.32.novo/client/Makefile.in
+--- mysql-5.1.32/client/Makefile.in	2009-02-13 23:02:45.000000000 -0200
++++ mysql-5.1.32.novo/client/Makefile.in	2009-03-24 05:32:44.000000000 -0300
+@@ -464,15 +464,15 @@
+ yassl_libs = @yassl_libs@
+ yassl_taocrypt_extra_cxxflags = @yassl_taocrypt_extra_cxxflags@
+ zlib_dir = @zlib_dir@
+- at THREAD_SAFE_CLIENT_FALSE@LIBMYSQLCLIENT_LA = $(top_builddir)/libmysql/libmysqlclient.la
+- at THREAD_SAFE_CLIENT_TRUE@LIBMYSQLCLIENT_LA = $(top_builddir)/libmysql_r/libmysqlclient_r.la
++ at THREAD_SAFE_CLIENT_FALSE@LIBMYSQLCLIENT_LA = /usr/lib/mysql/libmysqlclient.so
++ at THREAD_SAFE_CLIENT_TRUE@LIBMYSQLCLIENT_LA = /usr/lib/mysql/libmysqlclient_r.so
+ INCLUDES = -I$(top_builddir)/include \
+ 				-I$(top_srcdir)/include \
+ 				-I$(top_srcdir)/regex \
+                                 $(openssl_includes)
+ 
+ LDADD = @CLIENT_EXTRA_LDFLAGS@ $(CLIENT_THREAD_LIBS) \
+-				$(top_builddir)/libmysql/libmysqlclient.la
++				/usr/lib/mysql/libmysqlclient.so
+ 
+ noinst_HEADERS = sql_string.h completion_hash.h my_readline.h \
+ 				client_priv.h
+diff -Naur mysql-5.1.32/tests/Makefile.in mysql-5.1.32.novo/tests/Makefile.in
+--- mysql-5.1.32/tests/Makefile.in	2009-02-13 23:03:19.000000000 -0200
++++ mysql-5.1.32.novo/tests/Makefile.in	2009-03-24 05:32:35.000000000 -0300
+@@ -408,8 +408,8 @@
+ yassl_libs = @yassl_libs@
+ yassl_taocrypt_extra_cxxflags = @yassl_taocrypt_extra_cxxflags@
+ zlib_dir = @zlib_dir@
+- at THREAD_SAFE_CLIENT_FALSE@LIBMYSQLCLIENT_LA = $(top_builddir)/libmysql/libmysqlclient.la
+- at THREAD_SAFE_CLIENT_TRUE@LIBMYSQLCLIENT_LA = $(top_builddir)/libmysql_r/libmysqlclient_r.la
++ at THREAD_SAFE_CLIENT_FALSE@LIBMYSQLCLIENT_LA = /usr/lib/mysql/libmysqlclient.so
++ at THREAD_SAFE_CLIENT_TRUE@LIBMYSQLCLIENT_LA = /usr/lib/mysql/libmysqlclient_r.so
+ EXTRA_DIST = auto_increment.res auto_increment.tst \
+ 			function.res function.tst lock_test.pl lock_test.res \
+ 			export.pl big_record.pl \

Modified: testing-i686/mysql-no-clients.patch
===================================================================
--- testing-i686/mysql-no-clients.patch	2009-03-25 00:42:18 UTC (rev 31184)
+++ testing-i686/mysql-no-clients.patch	2009-03-25 00:43:02 UTC (rev 31185)
@@ -7,8 +7,8 @@
  			@pstack_dir@ \
 -			@sql_union_dirs@ unittest storage plugin \
 -			@sql_server@ @man_dirs@ tests \
-+			strings mysys dbug extra regex vio \
-+			sql unittest storage plugin \
++			strings mysys dbug storage regex extra vio \
++			sql unittest plugin \
 +			@sql_server@ \
  			netware @libmysqld_dirs@ \
  			mysql-test support-files sql-bench @tools_dirs@ \




More information about the arch-commits mailing list