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

[Thomas Deutschmann]

commit:     0d47dcbb9cab7990a02f7b4977033b825a4dbdad
Author:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
AuthorDate: Tue Oct 16 15:04:21 2018 +0000
Commit:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
CommitDate: Tue Oct 16 15:04:21 2018 +0000
URL:        https://gitweb.gentoo.org/proj/mysql-extras.git/commit/?id=0d47dcbb

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

Don't install PKCONFIG file.

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

 ...all_percona-server-5.7.23-without-clientlibs-tools.patch | 13 +++++++++++--
 1 file changed, 11 insertions(+), 2 deletions(-)

diff --git a/20018_all_percona-server-5.7.23-without-clientlibs-tools.patch b/20018_all_percona-server-5.7.23-without-clientlibs-tools.patch
index 35221f7..c2add24 100644
--- a/20018_all_percona-server-5.7.23-without-clientlibs-tools.patch
+++ b/20018_all_percona-server-5.7.23-without-clientlibs-tools.patch
@@ -74,7 +74,7 @@
  SET_TARGET_PROPERTIES(perror PROPERTIES LINKER_LANGUAGE CXX)
 --- a/libmysql/CMakeLists.txt
 +++ b/libmysql/CMakeLists.txt
-@@ -233,12 +233,17 @@ IF(WIN32)
+@@ -231,12 +231,17 @@ IF(WIN32)
    LIST(APPEND LIBS auth_win_client)
  ENDIF()
  
@@ -98,7 +98,7 @@
  
  # Visual Studio users need debug  static library for debug projects
  IF(MSVC)
-@@ -285,9 +290,15 @@ ENDIF()
+@@ -283,9 +288,15 @@ ENDIF()
  IF(NOT DISABLE_SHARED)
    # Merge several convenience libraries into one big perconaserverclient
    # and link them together into shared library.
@@ -146,6 +146,15 @@
    SET(PKGCONFIG_FILE ${LIBMYSQL_OS_OUTPUT_NAME}.pc)
    STRING(REGEX REPLACE "/mysql$" "" PKGCONFIG_DIR "${INSTALL_LIBDIR}")
    SET(PKGCONFIG_DIR "${PKGCONFIG_DIR}/pkgconfig")
+@@ -443,7 +448,7 @@ ELSE()
+     ${CMAKE_CURRENT_BINARY_DIR}/${PKGCONFIG_FILE}
+     ESCAPE_QUOTES @ONLY)
+ 
+-  IF(INSTALL_PKGCONFIGDIR)
++  IF(INSTALL_PKGCONFIGDIR AND NOT WITHOUT_CLIENTLIBS)
+     MESSAGE(STATUS "INSTALL ${PKGCONFIG_FILE} ${INSTALL_PKGCONFIGDIR}")
+     INSTALL(FILES
+       ${CMAKE_CURRENT_BINARY_DIR}/${PKGCONFIG_FILE}
 --- a/support-files/CMakeLists.txt
 +++ b/support-files/CMakeLists.txt
 @@ -59,8 +59,9 @@ IF(UNIX)