mysqlclient 5.5.15-1 màj port

3 files changed, 48 insertions, 87 deletions

diff --git a/extra/mysqlclient/.md5sum.i686 b/extra/mysqlclient/.md5sum.i686
index ef29e2f76..12fbbaa80 100644
--- a/extra/mysqlclient/.md5sum.i686
+++ b/extra/mysqlclient/.md5sum.i686
@@ -1,2 +1 @@
-19f43bb9c72b1b5f7ff86a7f921c9244  mysql-5.5.14.tar.gz
-d1921e85821a66196c24ef6e5346b572  mysql-fix-libs.patch
+306b5549c7bd72e8e705a890db0da82b  mysql-5.5.15.tar.gz
diff --git a/extra/mysqlclient/.md5sum.x86_64 b/extra/mysqlclient/.md5sum.x86_64
index ef29e2f76..12fbbaa80 100644
--- a/extra/mysqlclient/.md5sum.x86_64
+++ b/extra/mysqlclient/.md5sum.x86_64
@@ -1,2 +1 @@
-19f43bb9c72b1b5f7ff86a7f921c9244  mysql-5.5.14.tar.gz
-d1921e85821a66196c24ef6e5346b572  mysql-fix-libs.patch
+306b5549c7bd72e8e705a890db0da82b  mysql-5.5.15.tar.gz
diff --git a/extra/mysqlclient/Pkgfile b/extra/mysqlclient/Pkgfile
index 0d55c748e..6de3c7349 100644
--- a/extra/mysqlclient/Pkgfile
+++ b/extra/mysqlclient/Pkgfile
@@ -6,98 +6,61 @@
 # Run on: libmysql
 
 name=mysqlclient
-version=5.5.14
+version=5.5.15
 release=1
-source=(http://mirror.switch.ch/mirror/mysql/Downloads/MySQL-${version%.*}/mysql-$version.tar.gz \
-	http://nutyx.meticul.eu/files/patchs/$name/mysql-fix-libs.patch)
+source=(http://mirror.switch.ch/mirror/mysql/Downloads/MySQL-${version%.*}/mysql-$version.tar.gz )
 
 build () {
 	cd $SRC
-        mkdir build
-        cd build
+	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"
+	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=/srv/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
+	cmake ../mysql-$version \
+		-DCMAKE_BUILD_TYPE=Release \
+		-DCMAKE_INSTALL_PREFIX=/usr \
+		-DSYSCONFDIR=/etc/mysql \
+		-DMYSQL_DATADIR=/srv/mysql \
+		-DMYSQL_UNIX_ADDR=/var/run/mysqld/mysqld.sock \
+		-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 \
+		-DDEFAULT_CHARSET=utf8 \
+		-DDEFAULT_COLLATION=utf8_general_ci \
+		-DENABLED_LOCAL_INFILE=ON \
+		-DWITH_READLINE=ON \
+		-DWITH_ZLIB=system \
+		-DWITH_SSL=system \
+		-DWITH_LIBWRAP=ON \
+		-DWITH_MYSQLD_LDFLAGS="${LDFLAGS}" \
+		-DWITH_EXTRA_CHARSETS=complex \
+		-DWITH_EMBEDDED_SERVER=ON \
+		-DWITH_INNOBASE_STORAGE_ENGINE=1 \
+		-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
 
-        make
+	make
 
 	cd $SRC/build
-  	make -C client DESTDIR=$PKG install
+	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
+	# Installe les pages man
+	install -d $PKG/usr/share/man/man1
+	for man in mysql mysqladmin mysqlcheck mysqldump mysqlimport mysqlshow mysqlslap; do
+		install -m644 ../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
+	# Fournit par mysql
+	rm $PKG/usr/bin/{mysql_upgrade,mysqlbinlog,mysqltest}
 }
-