diff options
| author |   Thomas Deutschmann <whissi@gentoo.org> | 2019-08-02 17:48:22 +0200 |
|---|---|---|
| committer | Thomas Deutschmann <whissi@gentoo.org> | 2019-08-02 17:49:21 +0200 |
| commit | 511aab731f9fcb6e61f1eb1977f14b30682bb1ad (patch) | |
| tree | dcbb3505122e1967213848208f731362726f9e46 /20018_all_mysql-8.0.17-without-clientlibs-tools.patch | |
| parent | Fix 20018_all_mysql-8.0.17-without-clientlibs-tools.patch (diff) | |
| download | mysql-extras-511aab731f9fcb6e61f1eb1977f14b30682bb1ad.tar.gz mysql-extras-511aab731f9fcb6e61f1eb1977f14b30682bb1ad.tar.bz2 mysql-extras-511aab731f9fcb6e61f1eb1977f14b30682bb1ad.zip | |
Fix MySQL 8.0 patch setmysql-extras-20190802-1549Z
- Fix 20018_all_mysql-8.0.17-fix-libressl-support.patch
- Fix 20018_all_mysql-8.0.17-without-clientlibs-tools.patch
Signed-off-by: Thomas Deutschmann <whissi@gentoo.org>
Diffstat (limited to '20018_all_mysql-8.0.17-without-clientlibs-tools.patch')
| -rw-r--r-- | 20018_all_mysql-8.0.17-without-clientlibs-tools.patch | 13 |
1 files changed, 13 insertions, 0 deletions
diff --git a/20018_all_mysql-8.0.17-without-clientlibs-tools.patch b/20018_all_mysql-8.0.17-without-clientlibs-tools.patch index 16de874..042dd3e 100644 --- a/20018_all_mysql-8.0.17-without-clientlibs-tools.patch +++ b/20018_all_mysql-8.0.17-without-clientlibs-tools.patch @@ -154,3 +154,16 @@ ADD_DEPENDENCIES(perror GenError) TARGET_LINK_LIBRARIES(perror mysys) +@@ -107,7 +112,11 @@ IF (BUILD_BUNDLED_LZ4) + ENDIF() + + IF (BUILD_BUNDLED_ZLIB OR NOT OPENSSL_EXECUTABLE_HAS_ZLIB) +- MYSQL_ADD_EXECUTABLE(zlib_decompress zlib_decompress.cc) ++ IF(NOT WITHOUT_CLIENTLIBS) ++ MYSQL_ADD_EXECUTABLE(zlib_decompress zlib_decompress.cc) ++ ELSE(NOT WITHOUT_CLIENTLIBS) ++ MYSQL_ADD_EXECUTABLE(zlib_decompress zlib_decompress.cc SKIP_INSTALL) ++ ENDIF(NOT WITHOUT_CLIENTLIBS) + TARGET_LINK_LIBRARIES(zlib_decompress ${ZLIB_LIBRARY} mysys) + ENDIF() + |