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

[Douglas Soares de Andrade]

    Date: Tuesday, March 24, 2009 @ 04:38:21
  Author: douglas
Revision: 31061

Merged revisions 31060 via svnmerge from 
svn+ssh://archlinux.org/srv/svn-packages/mysql-clients/trunk

........
  r31060 | douglas | 2009-03-24 05:36:57 -0300 (Ter, 24 Mar 2009) | 1 line
  
  upgpkg: mysql-clients 5.1.32-2
........

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

----------------------+
 PKGBUILD             |   25 ++++++++++++-------------
 mysql-fix-libs.patch |   36 ++++++++++++++++++++++++++++++++++++
 2 files changed, 48 insertions(+), 13 deletions(-)


Property changes on: mysql-clients/repos/testing-i686
___________________________________________________________________
Modified: svnmerge-integrated
   - /mysql-clients/trunk:1-31057
   + /mysql-clients/trunk:1-31060

Modified: testing-i686/PKGBUILD
===================================================================
--- testing-i686/PKGBUILD	2009-03-24 08:36:57 UTC (rev 31060)
+++ testing-i686/PKGBUILD	2009-03-24 08:38:21 UTC (rev 31061)
@@ -3,7 +3,7 @@
 
 pkgname=mysql-clients
 pkgver=5.1.32
-pkgrel=1
+pkgrel=2
 pkgdesc="MySQL client tools"
 arch=(i686 x86_64)
 depends=("libmysqlclient>=${pkgver}")
@@ -11,10 +11,12 @@
 url=('http://www.mysql.com/')
 options=('!libtool')
 license=('GPL')
-source=(ftp://ftp.pucpr.br/mysql/Downloads/MySQL-5.1/mysql-$pkgver.tar.gz)
+source=(ftp://ftp.pucpr.br/mysql/Downloads/MySQL-5.1/mysql-$pkgver.tar.gz
+        mysql-fix-libs.patch)
 
 build() {
   cd $startdir/src/mysql-${pkgver}
+  patch -Np1 -i ${startdir}/src/mysql-fix-libs.patch || return 1
   
   ./configure --prefix=/usr --libexecdir=/usr/sbin \
   --localstatedir=/var --sysconfdir=/etc \
@@ -23,18 +25,14 @@
   --with-charset=latin1 --with-collation=latin1_general_ci \
   --with-extra-charsets=complex --enable-thread-safe-client \
   --with-libwrap
-  
+ 
   pushd include || return
-    make || return 1
+  make || return 1
   popd
- 
-  for dir in libmysql libmysql_r; do
-    pushd ${dir} || return 1
-    make link_sources
-    make || return 1
-    make DESTDIR=${startdir}/pkg install
-    popd
-  done
+
+  pushd libmysql
+  make link_sources get_password.lo || return
+  popd 
   
   for dir in strings regex mysys dbug extra; do
     pushd ${dir} || return 1
@@ -53,4 +51,5 @@
   rm -rf $pkgdir/usr/lib/
 
 }
-md5sums=('f2d14b5e3b9d50b809c9b9985e4513b7')
+md5sums=('f2d14b5e3b9d50b809c9b9985e4513b7'
+         'd1921e85821a66196c24ef6e5346b572')

Copied: mysql-clients/repos/testing-i686/mysql-fix-libs.patch (from rev 31060, mysql-clients/trunk/mysql-fix-libs.patch)
===================================================================
--- testing-i686/mysql-fix-libs.patch	                        (rev 0)
+++ testing-i686/mysql-fix-libs.patch	2009-03-24 08:38:21 UTC (rev 31061)
@@ -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 \