diff options
| author |   Brian Evans <grknight@gentoo.org> | 2017-06-28 13:40:47 -0400 |
|---|---|---|
| committer | Brian Evans <grknight@gentoo.org> | 2017-06-28 13:40:47 -0400 |
| commit | 7a0a7707d4f44865a4f33dfbecf37eb0195c8676 (patch) | |
| tree | e7e697e7a6df0a35de0ff91bf1d2d7592aef611b | |
| parent | Respin without-libs-tools patch for MariaDB 10.2.6 (diff) | |
| download | mysql-extras-7a0a7707d4f44865a4f33dfbecf37eb0195c8676.tar.gz mysql-extras-7a0a7707d4f44865a4f33dfbecf37eb0195c8676.tar.bz2 mysql-extras-7a0a7707d4f44865a4f33dfbecf37eb0195c8676.zip | |
Enable static-lib building for 10.2.6-without-libs-tools when tools are built
| -rw-r--r-- | 20018_all_mariadb-10.2.6-without-clientlibs-tools.patch | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/20018_all_mariadb-10.2.6-without-clientlibs-tools.patch b/20018_all_mariadb-10.2.6-without-clientlibs-tools.patch index 0ddf031..c063b76 100644 --- a/20018_all_mariadb-10.2.6-without-clientlibs-tools.patch +++ b/20018_all_mariadb-10.2.6-without-clientlibs-tools.patch @@ -86,10 +86,10 @@ diff -aurN a/libmariadb/libmariadb/CMakeLists.txt b/libmariadb/libmariadb/CMakeL -ADD_LIBRARY(mariadbclient STATIC ${mariadbclient_RC} ${MARIADB_OBJECTS} ${EMPTY_FILE} mariadbclient.def) -TARGET_LINK_LIBRARIES(mariadbclient ${SYSTEM_LIBS}) -+IF(ENABLE_STATIC_LIBS) ++IF(ENABLE_STATIC_LIBS OR NOT WITHOUT_TOOLS) + ADD_LIBRARY(mariadbclient STATIC ${mariadbclient_RC} ${MARIADB_OBJECTS} ${EMPTY_FILE} mariadbclient.def) + TARGET_LINK_LIBRARIES(mariadbclient ${SYSTEM_LIBS}) -+ENDIF(ENABLE_STATIC_LIBS) ++ENDIF(ENABLE_STATIC_LIBS OR NOT WITHOUT_TOOLS) ADD_LIBRARY(libmariadb SHARED ${libmariadb_RC} ${MARIADB_OBJECTS} ${EMPTY_FILE} mariadbclient.def) TARGET_LINK_LIBRARIES(libmariadb ${SYSTEM_LIBS}) @@ -97,9 +97,9 @@ diff -aurN a/libmariadb/libmariadb/CMakeLists.txt b/libmariadb/libmariadb/CMakeL TARGET_LINK_LIBRARIES (libmariadb "-Wl,--version-script=${CC_BINARY_DIR}/libmariadb/mariadbclient.def") ENDIF() -+IF(ENABLE_STATIC_LIBS) ++IF(ENABLE_STATIC_LIBS OR NOT WITHOUT_TOOLS) SET_TARGET_PROPERTIES(mariadbclient PROPERTIES IMPORTED_INTERFACE_LINK_LIBRARIES "${SYSTEM_LIBS}") -+ENDIF(ENABLE_STATIC_LIBS) ++ENDIF(ENABLE_STATIC_LIBS OR NOT WITHOUT_TOOLS) SET_TARGET_PROPERTIES(libmariadb PROPERTIES IMPORTED_INTERFACE_LINK_LIBRARIES "${SYSTEM_LIBS}") SET_TARGET_PROPERTIES(libmariadb PROPERTIES PREFIX "") |