diff options
Diffstat (limited to 'main/mysql/0001-prefer-dynamic-library.patch')
| -rw-r--r-- | main/mysql/0001-prefer-dynamic-library.patch | 72 |
1 files changed, 72 insertions, 0 deletions
diff --git a/main/mysql/0001-prefer-dynamic-library.patch b/main/mysql/0001-prefer-dynamic-library.patch new file mode 100644 index 000000000..f2ff4da62 --- /dev/null +++ b/main/mysql/0001-prefer-dynamic-library.patch @@ -0,0 +1,72 @@ +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( + ADD_DEFINITIONS(${READLINE_DEFINES}) + ADD_DEFINITIONS(${SSL_DEFINES}) + MYSQL_ADD_EXECUTABLE(mysql completion_hash.cc mysql.cc readline.cc sql_string.cc) +-TARGET_LINK_LIBRARIES(mysql mysqlclient) ++TARGET_LINK_LIBRARIES(mysql libmysql mysqlclient) + IF(UNIX) + TARGET_LINK_LIBRARIES(mysql ${READLINE_LIBRARY}) + ENDIF(UNIX) + + MYSQL_ADD_EXECUTABLE(mysqltest mysqltest.cc COMPONENT Test) + SET_SOURCE_FILES_PROPERTIES(mysqltest.cc PROPERTIES COMPILE_FLAGS "-DTHREADS") +-TARGET_LINK_LIBRARIES(mysqltest mysqlclient regex) ++TARGET_LINK_LIBRARIES(mysqltest libmysql mysqlclient regex) + + + MYSQL_ADD_EXECUTABLE(mysqlcheck mysqlcheck.c) +-TARGET_LINK_LIBRARIES(mysqlcheck mysqlclient) ++TARGET_LINK_LIBRARIES(mysqlcheck libmysql mysqlclient) + + MYSQL_ADD_EXECUTABLE(mysqldump mysqldump.c ../sql-common/my_user.c) +-TARGET_LINK_LIBRARIES(mysqldump mysqlclient) ++TARGET_LINK_LIBRARIES(mysqldump libmysql mysqlclient) + + MYSQL_ADD_EXECUTABLE(mysqlimport mysqlimport.c) +-TARGET_LINK_LIBRARIES(mysqlimport mysqlclient) ++TARGET_LINK_LIBRARIES(mysqlimport libmysql mysqlclient) + + MYSQL_ADD_EXECUTABLE(mysql_upgrade mysql_upgrade.c) +-TARGET_LINK_LIBRARIES(mysql_upgrade mysqlclient) ++TARGET_LINK_LIBRARIES(mysql_upgrade libmysql mysqlclient) + ADD_DEPENDENCIES(mysql_upgrade GenFixPrivs) + + MYSQL_ADD_EXECUTABLE(mysqlshow mysqlshow.c) +-TARGET_LINK_LIBRARIES(mysqlshow mysqlclient) ++TARGET_LINK_LIBRARIES(mysqlshow libmysql mysqlclient) + + MYSQL_ADD_EXECUTABLE(mysqlbinlog mysqlbinlog.cc) +-TARGET_LINK_LIBRARIES(mysqlbinlog mysqlclient) ++TARGET_LINK_LIBRARIES(mysqlbinlog libmysql mysqlclient) + + MYSQL_ADD_EXECUTABLE(mysqladmin mysqladmin.cc) +-TARGET_LINK_LIBRARIES(mysqladmin mysqlclient) ++TARGET_LINK_LIBRARIES(mysqladmin libmysql mysqlclient) + + MYSQL_ADD_EXECUTABLE(mysqlslap mysqlslap.c) + SET_SOURCE_FILES_PROPERTIES(mysqlslap.c PROPERTIES COMPILE_FLAGS "-DTHREADS") +-TARGET_LINK_LIBRARIES(mysqlslap mysqlclient) ++TARGET_LINK_LIBRARIES(mysqlslap libmysql mysqlclient) + + # "WIN32" also covers 64 bit. "echo" is used in some files below "mysql-test/". + IF(WIN32) +-- +1.7.4.2 + |