diff options
| -rw-r--r-- | main/mysql/APKBUILD | 8 | ||||
| -rw-r--r-- | main/mysql/mysql-prefer-dynamic-library.patch (renamed from main/mysql/0001-prefer-dynamic-library.patch) | 28 |
2 files changed, 11 insertions, 25 deletions
diff --git a/main/mysql/APKBUILD b/main/mysql/APKBUILD index 1c568521c7..c54b4f5c13 100644 --- a/main/mysql/APKBUILD +++ b/main/mysql/APKBUILD @@ -1,7 +1,7 @@ # Contributor: Carlo Landmeter <clandmeter@gmail.com> # Maintainer: Natanael Copa <ncopa@alpinelinux.org> pkgname=mysql -pkgver=5.5.15 +pkgver=5.5.16 pkgrel=0 pkgdesc="A fast SQL database server" url="http://www.mysql.com/" @@ -13,7 +13,7 @@ depends="mysql-common" depends_dev="openssl-dev zlib-dev" makedepends="libtool readline-dev openssl-dev ncurses-dev zlib-dev cmake bison perl libaio-dev" source="ftp://mirror.switch.ch/mirror/mysql/Downloads/MySQL-5.5/mysql-$pkgver.tar.gz - 0001-prefer-dynamic-library.patch + mysql-prefer-dynamic-library.patch $pkgname.initd " subpackages="$pkgname-doc $pkgname-dev $pkgname-libs $pkgname-test:mytest @@ -187,6 +187,6 @@ bench() { mv "$pkgdir"/usr/share/sql-bench "$subpkgdir"/usr/share/ } -md5sums="306b5549c7bd72e8e705a890db0da82b mysql-5.5.15.tar.gz -4e07e045a3abcb457c9c148dfd929ed6 0001-prefer-dynamic-library.patch +md5sums="462ab3752dd666ec06ca32f92673b59e mysql-5.5.16.tar.gz +b2b038b1905fa5b80f6723d0ee2f811f mysql-prefer-dynamic-library.patch d46df8ab94cb5686862ff90c0a6bf707 mysql.initd" diff --git a/main/mysql/0001-prefer-dynamic-library.patch b/main/mysql/mysql-prefer-dynamic-library.patch index f2ff4da620..49435d1dad 100644 --- a/main/mysql/0001-prefer-dynamic-library.patch +++ b/main/mysql/mysql-prefer-dynamic-library.patch @@ -1,21 +1,6 @@ -From 7c79a4adc72407b7265bc1508f6950d505ab1a17 Mon Sep 17 00:00:00 2001 -From: Natanael Copa <ncopa@alpinelinux.org> -Date: Fri, 1 Apr 2011 12:58:59 +0000 -Subject: [PATCH] prefer dynamic library - -we link to the dynamic library *and* the static so we get all used -symbols in the client apps. - -Linking to dynamic will make mysql client 300k instead of 3M ---- - client/CMakeLists.txt | 20 ++++++++++---------- - 1 files changed, 10 insertions(+), 10 deletions(-) - -diff --git a/client/CMakeLists.txt b/client/CMakeLists.txt -index 80c5bbd..21c6a58 100644 ---- a/client/CMakeLists.txt -+++ b/client/CMakeLists.txt -@@ -28,41 +28,41 @@ INCLUDE_DIRECTORIES( +--- ./client/CMakeLists.txt.orig ++++ ./client/CMakeLists.txt +@@ -28,44 +28,44 @@ ADD_DEFINITIONS(${READLINE_DEFINES}) ADD_DEFINITIONS(${SSL_DEFINES}) MYSQL_ADD_EXECUTABLE(mysql completion_hash.cc mysql.cc readline.cc sql_string.cc) @@ -52,6 +37,10 @@ index 80c5bbd..21c6a58 100644 -TARGET_LINK_LIBRARIES(mysqlshow mysqlclient) +TARGET_LINK_LIBRARIES(mysqlshow libmysql mysqlclient) + MYSQL_ADD_EXECUTABLE(mysql_plugin mysql_plugin.c) +-TARGET_LINK_LIBRARIES(mysql_plugin mysqlclient) ++TARGET_LINK_LIBRARIES(mysql_plugin libmysql mysqlclient) + MYSQL_ADD_EXECUTABLE(mysqlbinlog mysqlbinlog.cc) -TARGET_LINK_LIBRARIES(mysqlbinlog mysqlclient) +TARGET_LINK_LIBRARIES(mysqlbinlog libmysql mysqlclient) @@ -67,6 +56,3 @@ index 80c5bbd..21c6a58 100644 # "WIN32" also covers 64 bit. "echo" is used in some files below "mysql-test/". IF(WIN32) --- -1.7.4.2 - |