summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBrian Evans <grknight@gentoo.org>2018-03-12 15:42:10 -0400
committerBrian Evans <grknight@gentoo.org>2018-03-12 15:42:10 -0400
commita3ff8cc5f82d562d12e70e33a9a4e0875dc4bcb7 (patch)
treef468ee2023ee2c6251b8907c3f95d1712b5eacba
parentclient-libs: don't install for 5.7.21 (diff)
downloadmysql-extras-a3ff8cc5f82d562d12e70e33a9a4e0875dc4bcb7.tar.gz
mysql-extras-a3ff8cc5f82d562d12e70e33a9a4e0875dc4bcb7.tar.bz2
mysql-extras-a3ff8cc5f82d562d12e70e33a9a4e0875dc4bcb7.zip
client-libs: Dont install pkgconfig file
-rw-r--r--20018_all_mysql-5.7.21-without-clientlibs-tools.patch9
1 files changed, 9 insertions, 0 deletions
diff --git a/20018_all_mysql-5.7.21-without-clientlibs-tools.patch b/20018_all_mysql-5.7.21-without-clientlibs-tools.patch
index 267af79..05f5328 100644
--- a/20018_all_mysql-5.7.21-without-clientlibs-tools.patch
+++ b/20018_all_mysql-5.7.21-without-clientlibs-tools.patch
@@ -103,6 +103,15 @@ diff -aurN a/scripts/CMakeLists.txt b/scripts/CMakeLists.txt
STRING(REGEX REPLACE "/mysql$" "" PKGCONFIG_DIR "${INSTALL_LIBDIR}")
SET(PKGCONFIG_DIR "${PKGCONFIG_DIR}/pkgconfig")
+@@ -448,7 +448,7 @@
+ ${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}
diff -aurN a/libmysql/CMakeLists.txt b/libmysql/CMakeLists.txt
--- a/libmysql/CMakeLists.txt 2018-03-12 12:40:52.937143630 -0400
+++ b/libmysql/CMakeLists.txt 2018-03-12 14:07:13.513114687 -0400