commit: 8bc22a0db98cf0628fc01af900fb450219d57103
Author: Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
AuthorDate: Tue Oct 16 16:03:32 2018 +0000
Commit: Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
CommitDate: Tue Oct 16 16:03:32 2018 +0000
URL: https://gitweb.gentoo.org/proj/mysql-extras.git/commit/?id=8bc22a0d
Fix 20018_all_mysql-5.7.21-without-clientlibs-tools.patch
Don't install PKCONFIG file.
Signed-off-by: Thomas Deutschmann <whissi <AT> gentoo.org>
...all_mysql-5.7.21-without-clientlibs-tools.patch | 113 ++++++++++-----------
1 file changed, 54 insertions(+), 59 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 0ca8f48..35cc8de 100644
--- a/20018_all_mysql-5.7.21-without-clientlibs-tools.patch
+++ b/20018_all_mysql-5.7.21-without-clientlibs-tools.patch
@@ -1,7 +1,6 @@
-diff -aurN a/CMakeLists.txt b/CMakeLists.txt
---- a/CMakeLists.txt 2015-07-09 09:04:00.118091000 -0400
-+++ b/CMakeLists.txt 2015-07-09 09:17:06.291091000 -0400
-@@ -405,8 +405,6 @@
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -530,8 +530,6 @@ INCLUDE_DIRECTORIES(
MYSQL_CHECK_ZLIB_WITH_COMPRESS()
# Add bundled yassl/taocrypt or system openssl.
MYSQL_CHECK_SSL()
@@ -9,9 +8,9 @@ diff -aurN a/CMakeLists.txt b/CMakeLists.txt
-MYSQL_CHECK_EDITLINE()
# Add libevent
MYSQL_CHECK_LIBEVENT()
-
-@@ -436,7 +434,10 @@
- ADD_SUBDIRECTORY(storage/ndb)
+ # Add lz4 library
+@@ -620,7 +618,10 @@ IF(WITH_UNIT_TESTS)
+ ENABLE_TESTING()
ENDIF()
-ADD_SUBDIRECTORY(include)
@@ -22,7 +21,7 @@ diff -aurN a/CMakeLists.txt b/CMakeLists.txt
ADD_SUBDIRECTORY(dbug)
ADD_SUBDIRECTORY(strings)
ADD_SUBDIRECTORY(vio)
-@@ -462,7 +463,6 @@
+@@ -661,7 +662,6 @@ IF(WITH_UNIT_TESTS)
ENDIF()
ADD_SUBDIRECTORY(extra)
@@ -30,7 +29,7 @@ diff -aurN a/CMakeLists.txt b/CMakeLists.txt
ADD_SUBDIRECTORY(sql/share)
ADD_SUBDIRECTORY(libservices)
-@@ -470,11 +470,20 @@
+@@ -669,11 +669,20 @@ IF(UNIX)
ADD_SUBDIRECTORY(man)
ENDIF()
@@ -51,10 +50,9 @@ diff -aurN a/CMakeLists.txt b/CMakeLists.txt
ADD_SUBDIRECTORY(libmysqld)
ADD_SUBDIRECTORY(libmysqld/examples)
ENDIF(WITH_EMBEDDED_SERVER)
-diff -aurN a/extra/CMakeLists.txt b/extra/CMakeLists.txt
---- a/extra/CMakeLists.txt 2015-05-05 07:05:53.000000000 -0400
-+++ b/extra/CMakeLists.txt 2015-07-09 09:18:16.982091000 -0400
-@@ -72,12 +72,16 @@
+--- a/extra/CMakeLists.txt
++++ b/extra/CMakeLists.txt
+@@ -72,12 +72,16 @@ IF (WIN32 AND WITH_SSL_PATH AND HAVE_CRYPTO_DLL)
ADD_DEPENDENCIES(GenError copy_openssl_extra)
ENDIF()
@@ -74,48 +72,9 @@ diff -aurN a/extra/CMakeLists.txt b/extra/CMakeLists.txt
ADD_DEPENDENCIES(perror GenError)
TARGET_LINK_LIBRARIES(perror mysys mysys_ssl)
SET_TARGET_PROPERTIES(perror PROPERTIES LINKER_LANGUAGE CXX)
-diff -aurN a/scripts/CMakeLists.txt b/scripts/CMakeLists.txt
---- a/scripts/CMakeLists.txt 2015-07-09 09:04:00.401091000 -0400
-+++ b/scripts/CMakeLists.txt 2015-07-09 09:20:25.723091000 -0400
-@@ -433,18 +433,21 @@
-
- IF(WITH_SYSTEMD)
- SET(BIN_SCRIPTS
-- mysql_config
- mysqldumpslow
- )
- ELSE()
- SET(BIN_SCRIPTS
-- mysql_config
- mysqldumpslow
- mysqld_multi
- mysqld_safe
- )
- ENDIF()
--
-+ IF(NOT WITHOUT_CLIENTLIBS)
-+ SET(BIN_SCRIPTS
-+ ${BIN_SCRIPTS}
-+ mysql_config
-+ )
-+ ENDIF(NOT WITHOUT_CLIENTLIBS)
- SET(PKGCONFIG_FILE ${LIBMYSQL_OS_OUTPUT_NAME}.pc)
- 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
-@@ -232,12 +232,16 @@
+--- a/libmysql/CMakeLists.txt
++++ b/libmysql/CMakeLists.txt
+@@ -231,12 +231,16 @@ IF(WIN32)
LIST(APPEND LIBS auth_win_client)
ENDIF()
@@ -138,7 +97,7 @@ diff -aurN a/libmysql/CMakeLists.txt
b/libmysql/CMakeLists.txt
# Visual Studio users need debug static library for debug projects
IF(MSVC)
-@@ -271,9 +276,15 @@
+@@ -283,9 +287,15 @@ ENDIF()
IF(NOT DISABLE_SHARED)
# Merge several convenience libraries into one big mysqlclient
# and link them together into shared library.
@@ -154,9 +113,45 @@ diff -aurN a/libmysql/CMakeLists.txt
b/libmysql/CMakeLists.txt
IF(UNIX)
# libtool compatability
IF(CMAKE_SYSTEM_NAME MATCHES "FreeBSD" OR APPLE)
---- a/support-files/CMakeLists.txt 2018-03-12 14:11:44.931656906 -0400
-+++ b/support-files/CMakeLists.txt 2018-03-12 15:44:53.381846650 -0400
-@@ -59,8 +59,9 @@
+--- a/scripts/CMakeLists.txt
++++ b/scripts/CMakeLists.txt
+@@ -411,18 +411,21 @@ ELSE()
+
+ IF(WITH_SYSTEMD)
+ SET(BIN_SCRIPTS
+- mysql_config
+ mysqldumpslow
+ )
+ ELSE()
+ SET(BIN_SCRIPTS
+- mysql_config
+ mysqldumpslow
+ mysqld_multi
+ mysqld_safe
+ )
+ ENDIF()
+-
++ IF(NOT WITHOUT_CLIENTLIBS)
++ SET(BIN_SCRIPTS
++ ${BIN_SCRIPTS}
++ mysql_config
++ )
++ ENDIF(NOT WITHOUT_CLIENTLIBS)
+ SET(PKGCONFIG_FILE ${LIBMYSQL_OS_OUTPUT_NAME}.pc)
+ STRING(REGEX REPLACE "/mysql$" "" PKGCONFIG_DIR "${INSTALL_LIBDIR}")
+ SET(PKGCONFIG_DIR "${PKGCONFIG_DIR}/pkgconfig")
+@@ -437,7 +440,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)
IF(INSTALL_SUPPORTFILESDIR)
INSTALL(FILES magic DESTINATION ${inst_location} COMPONENT SupportFiles)
ENDIF()
