[arch-commits] Commit in mysql/trunk (PKGBUILD mysql-no-clients.patch)

[Douglas Soares de Andrade]

    Date: Tuesday, March 24, 2009 @ 20:42:18
  Author: douglas
Revision: 31184

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.

Modified:
  mysql/trunk/PKGBUILD
  mysql/trunk/mysql-no-clients.patch

------------------------+
 PKGBUILD               |   23 +++++++++--------------
 mysql-no-clients.patch |    4 ++--
 2 files changed, 11 insertions(+), 16 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2009-03-24 22:03:21 UTC (rev 31183)
+++ PKGBUILD	2009-03-25 00:42:18 UTC (rev 31184)
@@ -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'

Modified: mysql-no-clients.patch
===================================================================
--- mysql-no-clients.patch	2009-03-24 22:03:21 UTC (rev 31183)
+++ mysql-no-clients.patch	2009-03-25 00:42:18 UTC (rev 31184)
@@ -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@ \