diff options
author | 2019-10-31 01:49:57 +0100 | |
---|---|---|
committer | 2019-10-31 01:49:57 +0100 | |
commit | a2ad81add180c3980619ffb2cf31fc8cf8232580 (patch) | |
tree | 90f57dbf1e09ddd9933049342b79f1405121a04d | |
parent | Add 20018_all_percona-server-8.0.17-fix-libressl-support.patch (diff) | |
download | mysql-extras-a2ad81add180c3980619ffb2cf31fc8cf8232580.tar.gz mysql-extras-a2ad81add180c3980619ffb2cf31fc8cf8232580.tar.bz2 mysql-extras-a2ad81add180c3980619ffb2cf31fc8cf8232580.zip |
Fix 20018_all_percona-server-8.0.17-without-clientlibs-tools.patchmysql-extras-20191031-0134Z
Signed-off-by: Thomas Deutschmann <whissi@gentoo.org>
-rw-r--r-- | 20018_all_percona-server-8.0.17-without-clientlibs-tools.patch | 10 |
1 files changed, 3 insertions, 7 deletions
diff --git a/20018_all_percona-server-8.0.17-without-clientlibs-tools.patch b/20018_all_percona-server-8.0.17-without-clientlibs-tools.patch index cf7f747..a1a6eb0 100644 --- a/20018_all_percona-server-8.0.17-without-clientlibs-tools.patch +++ b/20018_all_percona-server-8.0.17-without-clientlibs-tools.patch @@ -20,7 +20,7 @@ ADD_SUBDIRECTORY(dbug) ADD_SUBDIRECTORY(strings) ADD_SUBDIRECTORY(vio) -@@ -1295,7 +1295,6 @@ IF(WITH_UNIT_TESTS) +@@ -1295,11 +1295,16 @@ IF(WITH_UNIT_TESTS) ADD_SUBDIRECTORY(unittest/mytap/t) ENDIF() @@ -28,9 +28,6 @@ ADD_SUBDIRECTORY(utilities) ADD_SUBDIRECTORY(share) ADD_SUBDIRECTORY(libservices) -@@ -1340,6 +1339,12 @@ IF(UNIX) - ADD_SUBDIRECTORY(man) - ENDIF() +IF(NOT WITHOUT_TOOLS) + # Add system/bundled editline @@ -39,8 +36,8 @@ +ENDIF(NOT WITHOUT_TOOLS) + IF(NOT WITHOUT_SERVER) - ADD_SUBDIRECTORY(packaging/rpm-common) - ADD_SUBDIRECTORY(packaging/rpm-oel) + ADD_SUBDIRECTORY(testclients) + ADD_SUBDIRECTORY(sql) --- a/libmysql/CMakeLists.txt +++ b/libmysql/CMakeLists.txt @@ -240,12 +240,17 @@ IF(WIN32) @@ -180,4 +177,3 @@ IF(WITH_INNOBASE_STORAGE_ENGINE) - |