summaryrefslogtreecommitdiff
path: root/databases/mysql80-client/files/patch-support-files_CMakeLists.txt
diff options
context:
space:
mode:
Diffstat (limited to 'databases/mysql80-client/files/patch-support-files_CMakeLists.txt')
-rw-r--r--databases/mysql80-client/files/patch-support-files_CMakeLists.txt34
1 files changed, 10 insertions, 24 deletions
diff --git a/databases/mysql80-client/files/patch-support-files_CMakeLists.txt b/databases/mysql80-client/files/patch-support-files_CMakeLists.txt
index 218a1e701b67..198e56776eb8 100644
--- a/databases/mysql80-client/files/patch-support-files_CMakeLists.txt
+++ b/databases/mysql80-client/files/patch-support-files_CMakeLists.txt
@@ -1,37 +1,23 @@
---- support-files/CMakeLists.txt.orig 2016-03-28 18:06:12 UTC
+--- support-files/CMakeLists.txt.orig 2017-06-27 11:44:29 UTC
+++ support-files/CMakeLists.txt
-@@ -44,14 +44,17 @@ ELSE()
- SET(inst_location ${INSTALL_SUPPORTFILESDIR})
- ENDIF()
-
-+IF(FALSE)
- SET(inifile my-default)
- CONFIGURE_FILE(${CMAKE_CURRENT_SOURCE_DIR}/${inifile}.cnf.sh
- ${CMAKE_CURRENT_BINARY_DIR}/${inifile}.${ini_file_extension} @ONLY)
- INSTALL(FILES ${CMAKE_CURRENT_BINARY_DIR}/${inifile}.${ini_file_extension}
- DESTINATION ${inst_location} COMPONENT IniFiles)
-+ENDIF()
-
- IF(UNIX)
+@@ -46,6 +46,7 @@ IF(UNIX)
+ ELSE()
+ SET (PIDOF "pgrep -d' ' -f")
+ ENDIF()
++IF (FALSE)
SET(prefix ${CMAKE_INSTALL_PREFIX})
-+IF(FALSE)
FOREACH(script mysqld_multi.server mysql-log-rotate)
CONFIGURE_FILE(${CMAKE_CURRENT_SOURCE_DIR}/${script}.sh
- ${CMAKE_CURRENT_BINARY_DIR}/${script} @ONLY )
-@@ -68,9 +71,11 @@ IF(UNIX)
+@@ -59,9 +60,12 @@ IF(UNIX)
IF(INSTALL_SUPPORTFILESDIR)
INSTALL(FILES magic DESTINATION ${inst_location} COMPONENT SupportFiles)
ENDIF()
+ENDIF()
++ENDIF()
INSTALL(FILES mysql.m4 DESTINATION ${INSTALL_SHAREDIR}/aclocal COMPONENT Development)
-+IF(FALSE)
++IF (FALSE)
SET(bindir ${prefix}/${INSTALL_BINDIR})
SET(sbindir ${prefix}/${INSTALL_SBINDIR})
- SET(scriptdir ${prefix}/${INSTALL_SCRIPTDIR})
-@@ -83,3 +88,4 @@ IF(UNIX)
- PERMISSIONS OWNER_READ OWNER_WRITE OWNER_EXECUTE GROUP_READ
- GROUP_EXECUTE WORLD_READ WORLD_EXECUTE)
- ENDIF()
-+ENDIF()
+ SET(libexecdir ${prefix}/${INSTALL_SBINDIR})