summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authortnut <thierryn1 at hispeed dot ch>2010-10-14 08:46:47 +0200
committertnut <thierryn1 at hispeed dot ch>2010-10-14 08:46:47 +0200
commit68a220cd97d14d3f800821bdeed274021d9356d1 (patch)
tree49d556f1219ca8859e243854c405248f7c2662f7
parent03f7308229aae5d1433bf77bb452b7aec650189f (diff)
downloadnutyx-pakxe-68a220cd97d14d3f800821bdeed274021d9356d1.tar.gz
nutyx-pakxe-68a220cd97d14d3f800821bdeed274021d9356d1.tar.bz2
nutyx-pakxe-68a220cd97d14d3f800821bdeed274021d9356d1.tar.xz
nutyx-pakxe-68a220cd97d14d3f800821bdeed274021d9356d1.zip
mysqlclient, port nettoyé
-rw-r--r--extra/mysqlclient/Pkgfile2
-rw-r--r--extra/mysqlclient/mysql-fix-libs.patch36
2 files changed, 1 insertions, 37 deletions
diff --git a/extra/mysqlclient/Pkgfile b/extra/mysqlclient/Pkgfile
index 03276a55a..39663dbee 100644
--- a/extra/mysqlclient/Pkgfile
+++ b/extra/mysqlclient/Pkgfile
@@ -8,7 +8,7 @@ name=mysqlclient
version=5.1.46
release=1
source=(http://mirror.switch.ch/mirror/mysql/Downloads/MySQL-5.1/mysql-$version.tar.gz \
- mysql-fix-libs.patch)
+ http://nutyx.meticul.eu/files/patchs/$name/mysql-fix-libs.patch)
build () {
cd mysql-$version
diff --git a/extra/mysqlclient/mysql-fix-libs.patch b/extra/mysqlclient/mysql-fix-libs.patch
deleted file mode 100644
index 0fb48fb22..000000000
--- a/extra/mysqlclient/mysql-fix-libs.patch
+++ /dev/null
@@ -1,36 +0,0 @@
-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@
--@THREAD_SAFE_CLIENT_FALSE@LIBMYSQLCLIENT_LA = $(top_builddir)/libmysql/libmysqlclient.la
--@THREAD_SAFE_CLIENT_TRUE@LIBMYSQLCLIENT_LA = $(top_builddir)/libmysql_r/libmysqlclient_r.la
-+@THREAD_SAFE_CLIENT_FALSE@LIBMYSQLCLIENT_LA = /usr/lib/mysql/libmysqlclient.so
-+@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@
--@THREAD_SAFE_CLIENT_FALSE@LIBMYSQLCLIENT_LA = $(top_builddir)/libmysql/libmysqlclient.la
--@THREAD_SAFE_CLIENT_TRUE@LIBMYSQLCLIENT_LA = $(top_builddir)/libmysql_r/libmysqlclient_r.la
-+@THREAD_SAFE_CLIENT_FALSE@LIBMYSQLCLIENT_LA = /usr/lib/mysql/libmysqlclient.so
-+@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 \