| 1 |
commit: 7a0a7707d4f44865a4f33dfbecf37eb0195c8676 |
| 2 |
Author: Brian Evans <grknight <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Wed Jun 28 17:40:47 2017 +0000 |
| 4 |
Commit: Brian Evans <grknight <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Wed Jun 28 17:40:47 2017 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/proj/mysql-extras.git/commit/?id=7a0a7707 |
| 7 |
|
| 8 |
Enable static-lib building for 10.2.6-without-libs-tools when tools are built |
| 9 |
|
| 10 |
20018_all_mariadb-10.2.6-without-clientlibs-tools.patch | 8 ++++---- |
| 11 |
1 file changed, 4 insertions(+), 4 deletions(-) |
| 12 |
|
| 13 |
diff --git a/20018_all_mariadb-10.2.6-without-clientlibs-tools.patch b/20018_all_mariadb-10.2.6-without-clientlibs-tools.patch |
| 14 |
index 0ddf031..c063b76 100644 |
| 15 |
--- a/20018_all_mariadb-10.2.6-without-clientlibs-tools.patch |
| 16 |
+++ b/20018_all_mariadb-10.2.6-without-clientlibs-tools.patch |
| 17 |
@@ -86,10 +86,10 @@ diff -aurN a/libmariadb/libmariadb/CMakeLists.txt b/libmariadb/libmariadb/CMakeL |
| 18 |
|
| 19 |
-ADD_LIBRARY(mariadbclient STATIC ${mariadbclient_RC} ${MARIADB_OBJECTS} ${EMPTY_FILE} mariadbclient.def) |
| 20 |
-TARGET_LINK_LIBRARIES(mariadbclient ${SYSTEM_LIBS}) |
| 21 |
-+IF(ENABLE_STATIC_LIBS) |
| 22 |
++IF(ENABLE_STATIC_LIBS OR NOT WITHOUT_TOOLS) |
| 23 |
+ ADD_LIBRARY(mariadbclient STATIC ${mariadbclient_RC} ${MARIADB_OBJECTS} ${EMPTY_FILE} mariadbclient.def) |
| 24 |
+ TARGET_LINK_LIBRARIES(mariadbclient ${SYSTEM_LIBS}) |
| 25 |
-+ENDIF(ENABLE_STATIC_LIBS) |
| 26 |
++ENDIF(ENABLE_STATIC_LIBS OR NOT WITHOUT_TOOLS) |
| 27 |
ADD_LIBRARY(libmariadb SHARED ${libmariadb_RC} ${MARIADB_OBJECTS} ${EMPTY_FILE} mariadbclient.def) |
| 28 |
TARGET_LINK_LIBRARIES(libmariadb ${SYSTEM_LIBS}) |
| 29 |
|
| 30 |
@@ -97,9 +97,9 @@ diff -aurN a/libmariadb/libmariadb/CMakeLists.txt b/libmariadb/libmariadb/CMakeL |
| 31 |
TARGET_LINK_LIBRARIES (libmariadb "-Wl,--version-script=${CC_BINARY_DIR}/libmariadb/mariadbclient.def") |
| 32 |
ENDIF() |
| 33 |
|
| 34 |
-+IF(ENABLE_STATIC_LIBS) |
| 35 |
++IF(ENABLE_STATIC_LIBS OR NOT WITHOUT_TOOLS) |
| 36 |
SET_TARGET_PROPERTIES(mariadbclient PROPERTIES IMPORTED_INTERFACE_LINK_LIBRARIES "${SYSTEM_LIBS}") |
| 37 |
-+ENDIF(ENABLE_STATIC_LIBS) |
| 38 |
++ENDIF(ENABLE_STATIC_LIBS OR NOT WITHOUT_TOOLS) |
| 39 |
SET_TARGET_PROPERTIES(libmariadb PROPERTIES IMPORTED_INTERFACE_LINK_LIBRARIES "${SYSTEM_LIBS}") |
| 40 |
|
| 41 |
SET_TARGET_PROPERTIES(libmariadb PROPERTIES PREFIX "") |
Archives