[arch-commits] Commit in mysql/trunk (PKGBUILD)

[Andrea Scarpino]

    Date: Saturday, February 5, 2011 @ 15:35:55
  Author: andrea
Revision: 109092

upgpkg: mysql 5.5.8-9
build using bundled readline (FS#22530) and zlib from system; move plugins to /usr/lib/mysql/plugins

Modified:
  mysql/trunk/PKGBUILD

----------+
 PKGBUILD |   15 +++++++++------
 1 file changed, 9 insertions(+), 6 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2011-02-05 20:31:30 UTC (rev 109091)
+++ PKGBUILD	2011-02-05 20:35:55 UTC (rev 109092)
@@ -6,11 +6,11 @@
 pkgbase=mysql
 pkgname=('libmysqlclient' 'mysql-clients' 'mysql')
 pkgver=5.5.8
-pkgrel=8
+pkgrel=9
 arch=('i686' 'x86_64')
 license=('GPL')
 url="http://www.mysql.com/"
-makedepends=('cmake' 'openssl' 'tcp_wrappers')
+makedepends=('cmake' 'openssl' 'tcp_wrappers' 'zlib' 'readline')
 options=('!libtool')
 source=("http://ftp.gwdg.de/pub/misc/mysql/Downloads/MySQL-5.5/${pkgbase}-${pkgver}.tar.gz"
         'mysqld'
@@ -46,21 +46,21 @@
     -DSYSCONFDIR=/etc/mysql \
     -DINSTALL_INFODIR=share/mysql/docs \
     -DINSTALL_MANDIR=share/man \
-    -DINSTALL_PLUGINDIR=share/mysql/lib/plugin \
+    -DINSTALL_PLUGINDIR=/usr/lib/mysql/plugin \
     -DINSTALL_SCRIPTDIR=bin \
     -DINSTALL_INCLUDEDIR=include/mysql \
     -DINSTALL_DOCREADMEDIR=share/mysql \
     -DINSTALL_SUPPORTFILESDIR=share/mysql \
     -DINSTALL_MYSQLSHAREDIR=share/mysql \
     -DINSTALL_SHAREDIR=share/mysql \
-    -DWITH_READLINE=OFF \
+    -DWITH_READLINE=ON \
+    -DWITH_ZLIB=system \
     -DWITH_SSL=system \
     -DWITH_LIBWRAP=ON \
     -DDEFAULT_CHARSET=utf8 \
     -DDEFAULT_COLLATION=utf8_general_ci \
     -DWITH_EXTRA_CHARSETS=complex \
     -DWITH_EMBEDDED_SERVER=ON \
-    -DMYSQL_TCP_PORT=3306 \
     -DMYSQL_UNIX_ADDR=/var/run/mysqld/mysqld.sock \
     -DENABLED_LOCAL_INFILE=ON \
     -DWITH_PARTITION_STORAGE_ENGINE=1 \
@@ -88,6 +88,9 @@
   for man in mysql_config mysql_client_test_embedded mysqltest_embedded; do
     install -m644 "${srcdir}/${pkgbase}-${pkgver}/man/$man.1" "${pkgdir}/usr/share/man/man1/$man.1"
   done
+
+  #fix permissions
+  chmod 644 "${pkgdir}/usr/lib/libmysqlclient_r.a"
 }
 
 package_mysql-clients(){
@@ -122,7 +125,7 @@
 
   # provided by libmysqlclient
   rm ${pkgdir}/usr/bin/{mysql_config,mysql_client_test_embedded,mysqltest_embedded}
-  rm -r ${pkgdir}/usr/lib/
+  rm ${pkgdir}/usr/lib/libmysql*
   rm -r ${pkgdir}/usr/include/
   rm ${pkgdir}/usr/share/man/man1/{mysql_config,mysql_client_test_embedded,mysqltest_embedded}.1