diff options
| author |   Brian Evans <grknight@gentoo.org> | 2018-03-12 14:10:08 -0400 |
|---|---|---|
| committer | Brian Evans <grknight@gentoo.org> | 2018-03-12 14:10:08 -0400 |
| commit | fae6321070c88cdb61d2094ffb71f050b76c50c5 (patch) | |
| tree | 3de5772576f733778c3958951aa5b0b66e700bc9 | |
| parent | client-libs: 5.7.21 patch goes too far for libmysql (diff) | |
| download | mysql-extras-fae6321070c88cdb61d2094ffb71f050b76c50c5.tar.gz mysql-extras-fae6321070c88cdb61d2094ffb71f050b76c50c5.tar.bz2 mysql-extras-fae6321070c88cdb61d2094ffb71f050b76c50c5.zip | |
client-libs: don't install for 5.7.21
| -rw-r--r-- | 20018_all_mysql-5.7.21-without-clientlibs-tools.patch | 42 |
1 files changed, 42 insertions, 0 deletions
diff --git a/20018_all_mysql-5.7.21-without-clientlibs-tools.patch b/20018_all_mysql-5.7.21-without-clientlibs-tools.patch index b9e8f09..267af79 100644 --- a/20018_all_mysql-5.7.21-without-clientlibs-tools.patch +++ b/20018_all_mysql-5.7.21-without-clientlibs-tools.patch @@ -103,3 +103,45 @@ diff -aurN a/scripts/CMakeLists.txt b/scripts/CMakeLists.txt STRING(REGEX REPLACE "/mysql$" "" PKGCONFIG_DIR "${INSTALL_LIBDIR}") SET(PKGCONFIG_DIR "${PKGCONFIG_DIR}/pkgconfig") +diff -aurN a/libmysql/CMakeLists.txt b/libmysql/CMakeLists.txt +--- a/libmysql/CMakeLists.txt 2018-03-12 12:40:52.937143630 -0400 ++++ b/libmysql/CMakeLists.txt 2018-03-12 14:07:13.513114687 -0400 +@@ -232,12 +232,16 @@ + LIST(APPEND LIBS auth_win_client) + ENDIF() + +-# LDAP authentication SASL client plugin +-MESSAGE(STATUS "Creating LDAP authentication SASL client library.") +-ADD_SUBDIRECTORY(authentication_ldap) +- +-# Merge several convenience libraries into one big mysqlclient +-MERGE_CONVENIENCE_LIBRARIES(mysqlclient ${LIBS} COMPONENT Development) ++IF(WITHOUT_CLIENTLIBS) ++ # Merge several convenience libraries into one big mysqlclient ++ MERGE_CONVENIENCE_LIBRARIES(mysqlclient ${LIBS} COMPONENT Development SKIP_INSTALL) ++ELSE(WITHOUT_CLIENTLIBS) ++ # LDAP authentication SASL client plugin ++ MESSAGE(STATUS "Creating LDAP authentication SASL client library.") ++ ADD_SUBDIRECTORY(authentication_ldap) ++ # Merge several convenience libraries into one big mysqlclient ++ MERGE_CONVENIENCE_LIBRARIES(mysqlclient ${LIBS} COMPONENT Development) ++ENDIF(WITHOUT_CLIENTLIBS) + + # Visual Studio users need debug static library for debug projects + IF(MSVC) +@@ -271,9 +276,15 @@ + IF(NOT DISABLE_SHARED) + # Merge several convenience libraries into one big mysqlclient + # and link them together into shared library. ++IF(WITHOUT_CLIENTLIBS) ++ MERGE_LIBRARIES_SHARED(libmysql ${LIBS} ++ EXPORTS ${CLIENT_API_FUNCTIONS} ${CLIENT_API_FUNCTIONS_UNDOCUMENTED} ++ COMPONENT SharedLibraries SKIP_INSTALL) ++ELSE(WITHOUT_CLIENTLIBS) + MERGE_LIBRARIES_SHARED(libmysql ${LIBS} + EXPORTS ${CLIENT_API_FUNCTIONS} ${CLIENT_API_FUNCTIONS_UNDOCUMENTED} + COMPONENT SharedLibraries) ++ENDIF(WITHOUT_CLIENTLIBS) + IF(UNIX) + # libtool compatability + IF(CMAKE_SYSTEM_NAME MATCHES "FreeBSD" OR APPLE) |