mysqlclient, maj 5.5.11-1

5 files changed, 111 insertions, 44 deletions

diff --git a/extra/mysqlclient/.footprint.i686 b/extra/mysqlclient/.footprint.i686
index 786f808ff..ae51e470b 100644
--- a/extra/mysqlclient/.footprint.i686
+++ b/extra/mysqlclient/.footprint.i686
@@ -1,12 +1,19 @@
 drwxr-xr-x	root/root	usr/
 drwxr-xr-x	root/root	usr/bin/
 -rwxr-xr-x	root/root	usr/bin/mysql
--rwxr-xr-x	root/root	usr/bin/mysql_upgrade
 -rwxr-xr-x	root/root	usr/bin/mysqladmin
--rwxr-xr-x	root/root	usr/bin/mysqlbinlog
 -rwxr-xr-x	root/root	usr/bin/mysqlcheck
 -rwxr-xr-x	root/root	usr/bin/mysqldump
 -rwxr-xr-x	root/root	usr/bin/mysqlimport
 -rwxr-xr-x	root/root	usr/bin/mysqlshow
 -rwxr-xr-x	root/root	usr/bin/mysqlslap
--rwxr-xr-x	root/root	usr/bin/mysqltest
+drwxr-xr-x	root/root	usr/share/
+drwxr-xr-x	root/root	usr/share/man/
+drwxr-xr-x	root/root	usr/share/man/man1/
+-rw-r--r--	root/root	usr/share/man/man1/mysql.1.gz
+-rw-r--r--	root/root	usr/share/man/man1/mysqladmin.1.gz
+-rw-r--r--	root/root	usr/share/man/man1/mysqlcheck.1.gz
+-rw-r--r--	root/root	usr/share/man/man1/mysqldump.1.gz
+-rw-r--r--	root/root	usr/share/man/man1/mysqlimport.1.gz
+-rw-r--r--	root/root	usr/share/man/man1/mysqlshow.1.gz
+-rw-r--r--	root/root	usr/share/man/man1/mysqlslap.1.gz
diff --git a/extra/mysqlclient/.footprint.x86_64 b/extra/mysqlclient/.footprint.x86_64
index 786f808ff..ae51e470b 100644
--- a/extra/mysqlclient/.footprint.x86_64
+++ b/extra/mysqlclient/.footprint.x86_64
@@ -1,12 +1,19 @@
 drwxr-xr-x	root/root	usr/
 drwxr-xr-x	root/root	usr/bin/
 -rwxr-xr-x	root/root	usr/bin/mysql
--rwxr-xr-x	root/root	usr/bin/mysql_upgrade
 -rwxr-xr-x	root/root	usr/bin/mysqladmin
--rwxr-xr-x	root/root	usr/bin/mysqlbinlog
 -rwxr-xr-x	root/root	usr/bin/mysqlcheck
 -rwxr-xr-x	root/root	usr/bin/mysqldump
 -rwxr-xr-x	root/root	usr/bin/mysqlimport
 -rwxr-xr-x	root/root	usr/bin/mysqlshow
 -rwxr-xr-x	root/root	usr/bin/mysqlslap
--rwxr-xr-x	root/root	usr/bin/mysqltest
+drwxr-xr-x	root/root	usr/share/
+drwxr-xr-x	root/root	usr/share/man/
+drwxr-xr-x	root/root	usr/share/man/man1/
+-rw-r--r--	root/root	usr/share/man/man1/mysql.1.gz
+-rw-r--r--	root/root	usr/share/man/man1/mysqladmin.1.gz
+-rw-r--r--	root/root	usr/share/man/man1/mysqlcheck.1.gz
+-rw-r--r--	root/root	usr/share/man/man1/mysqldump.1.gz
+-rw-r--r--	root/root	usr/share/man/man1/mysqlimport.1.gz
+-rw-r--r--	root/root	usr/share/man/man1/mysqlshow.1.gz
+-rw-r--r--	root/root	usr/share/man/man1/mysqlslap.1.gz
diff --git a/extra/mysqlclient/.md5sum.i686 b/extra/mysqlclient/.md5sum.i686
index 3e8c6e708..26c547368 100644
--- a/extra/mysqlclient/.md5sum.i686
+++ b/extra/mysqlclient/.md5sum.i686
@@ -1,2 +1,2 @@
-e07e79edad557874d0870c914c9c81e1  mysql-5.1.55.tar.gz
+befa4e0d0aa95be6c8f6f143ae3b0641  mysql-5.5.11.tar.gz
 d1921e85821a66196c24ef6e5346b572  mysql-fix-libs.patch
diff --git a/extra/mysqlclient/.md5sum.x86_64 b/extra/mysqlclient/.md5sum.x86_64
index 3e8c6e708..26c547368 100644
--- a/extra/mysqlclient/.md5sum.x86_64
+++ b/extra/mysqlclient/.md5sum.x86_64
@@ -1,2 +1,2 @@
-e07e79edad557874d0870c914c9c81e1  mysql-5.1.55.tar.gz
+befa4e0d0aa95be6c8f6f143ae3b0641  mysql-5.5.11.tar.gz
 d1921e85821a66196c24ef6e5346b572  mysql-fix-libs.patch
diff --git a/extra/mysqlclient/Pkgfile b/extra/mysqlclient/Pkgfile
index a5eedc0d6..e7b23a6f4 100644
--- a/extra/mysqlclient/Pkgfile
+++ b/extra/mysqlclient/Pkgfile
@@ -6,46 +6,99 @@
 # Run on: libmysql
 
 name=mysqlclient
-version=5.1.55
+version=5.5.11
+#5.1.55
 release=1
-source=(http://mirror.switch.ch/mirror/mysql/Downloads/MySQL-5.1/mysql-$version.tar.gz \
+source=(http://mirror.switch.ch/mirror/mysql/Downloads/MySQL-5.5/mysql-$version.tar.gz \
 	http://nutyx.meticul.eu/files/patchs/$name/mysql-fix-libs.patch)
 
 build () {
-	cd mysql-$version
-	patch -Np1 -i ../mysql-fix-libs.patch
-	./configure --prefix=/usr \
-                --sysconfdir=/etc \
-                --libexecdir=/usr/sbin \
-                --localstatedir=/srv/mysql \
-                --enable-thread-safe-client \
-                --enable-local-infile \
-                --with-extra-charsets=all \
-                --with-berkeley-db \
-                --without-debug \
-                --without-readline \
-                --without-docs \
-                --without-bench \
-		--with-libwrap
-
-	pushd include
-		make
-	popd
-	pushd libmysql
-		make link_sources get_password.lo
-	popd
-	for i in strings regex mysys dbug extra
-	do pushd $i
-		make
-	popd
-	done
-	cd client
-	sed -i -e \
-'s|\$(top_builddir)/libmysql/libmysqlclient.la|/usr/lib/mysql/libmysqlclient.so|g' \
-Makefile
-	make link_sources
-	make 
-	make DESTDIR=$PKG install
+	cd $SRC
+        mkdir build
+        cd build
+
+        CFLAGS="-fPIC ${CFLAGS} -fno-strict-aliasing -DBIG_JOINS=1 -fomit-frame-pointer"
+        CXXFLAGS="-fPIC ${CXXFLAGS} -fno-strict-aliasing  -DBIG_JOINS=1 -felide-constructors -fno-rtti"
+
+        cmake ../mysql-$version \
+            -DCMAKE_BUILD_TYPE=Release \
+            -DCMAKE_INSTALL_PREFIX=/usr \
+            -DMYSQL_DATADIR=/var/lib/mysql \
+            -DSYSCONFDIR=/etc/mysql \
+            -DINSTALL_INFODIR=share/mysql/docs \
+            -DINSTALL_MANDIR=share/man \
+            -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=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_UNIX_ADDR=/var/run/mysqld/mysqld.sock \
+            -DENABLED_LOCAL_INFILE=ON \
+            -DWITH_PARTITION_STORAGE_ENGINE=1 \
+            -DWITHOUT_EXAMPLE_STORAGE_ENGINE=1 \
+            -DWITHOUT_ARCHIVE_STORAGE_ENGINE=1 \
+            -DWITHOUT_BLACKHOLE_STORAGE_ENGINE=1 \
+            -DWITHOUT_FEDERATED_STORAGE_ENGINE=1 \
+            -DWITH_INNOBASE_STORAGE_ENGINE=1
+
+        make
+
+	cd $SRC/build
+  	make -C client DESTDIR=$PKG install
+
+  	# install man pages
+  	install -d $PKG/usr/share/man/man1
+  	for man in mysql mysqladmin mysqlcheck mysqldump mysqlimport mysqlshow mysqlslap; do
+    		install -m644 $SRC/mysql-$version/man/$man.1 $PKG/usr/share/man/man1/$man.1
+  	done
+
+  	# provided by mysql
+  	rm $PKG/usr/bin/{mysql_upgrade,mysqlbinlog,mysqltest}
+
+#	cd mysql-$version
+#	patch -Np1 -i ../mysql-fix-libs.patch
+#	./configure --prefix=/usr \
+#                --sysconfdir=/etc \
+#                --libexecdir=/usr/sbin \
+#                --localstatedir=/srv/mysql \
+#                --enable-thread-safe-client \
+#                --enable-local-infile \
+#                --with-extra-charsets=all \
+#                --with-berkeley-db \
+#                --without-debug \
+#                --without-readline \
+#                --without-docs \
+#                --without-bench \
+#		--with-libwrap
+#
+#	pushd include
+#		make
+#	popd
+#	pushd libmysql
+#		make link_sources get_password.lo
+#	popd
+#	for i in strings regex mysys dbug extra
+#	do pushd $i
+#		make
+#	popd
+#	done
+#	cd client
+#	sed -i -e \
+#'s|\$(top_builddir)/libmysql/libmysqlclient.la|/usr/lib/mysql/libmysqlclient.so|g' \
+#Makefile
+#	make link_sources
+#	make 
+#	make DESTDIR=$PKG install
 #	rm -r $PKG/usr/lib
 }