[gentoo-commits] proj/mysql-extras:master commit in: /

[Thomas Deutschmann]

commit:     a2ad81add180c3980619ffb2cf31fc8cf8232580
Author:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
AuthorDate: Thu Oct 31 00:49:57 2019 +0000
Commit:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
CommitDate: Thu Oct 31 00:49:57 2019 +0000
URL:        https://gitweb.gentoo.org/proj/mysql-extras.git/commit/?id=a2ad81ad

Fix 20018_all_percona-server-8.0.17-without-clientlibs-tools.patch

Signed-off-by: Thomas Deutschmann <whissi <AT> gentoo.org>

 20018_all_percona-server-8.0.17-without-clientlibs-tools.patch | 10 +++-------
 1 file 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)
  
-