diff options
| author | Natanael Copa <ncopa@alpinelinux.org> | 2011-09-16 06:57:17 +0000 |
|---|---|---|
| committer | Natanael Copa <ncopa@alpinelinux.org> | 2011-09-16 06:58:07 +0000 |
| commit | 7e3b1caa95ced26d2f112e600305b838b4d9e4be (patch) | |
| tree | 501e1794460393b8fb1ee38ab56447a18026dc4e /main/mysql/mysql-prefer-dynamic-library.patch | |
| parent | 4fc5b7153a82639f151ae0a2627d57d18d00487c (diff) | |
| download | aports-7e3b1caa95ced26d2f112e600305b838b4d9e4be.tar.bz2 aports-7e3b1caa95ced26d2f112e600305b838b4d9e4be.tar.xz | |
main/mysql: upgrade to 5.5.16
Diffstat (limited to 'main/mysql/mysql-prefer-dynamic-library.patch')
| -rw-r--r-- | main/mysql/mysql-prefer-dynamic-library.patch | 58 |
1 files changed, 58 insertions, 0 deletions
diff --git a/main/mysql/mysql-prefer-dynamic-library.patch b/main/mysql/mysql-prefer-dynamic-library.patch new file mode 100644 index 0000000000..49435d1dad --- /dev/null +++ b/main/mysql/mysql-prefer-dynamic-library.patch @@ -0,0 +1,58 @@ +--- ./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) +-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(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) + + 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) |