diff options
| author | Mark Felder <feld@FreeBSD.org> | 2017-12-31 15:28:55 +0000 |
|---|---|---|
| committer | Mark Felder <feld@FreeBSD.org> | 2017-12-31 15:28:55 +0000 |
| commit | 74aca3ab1f0d92e3417e8daf073ebb178ce01578 (patch) | |
| tree | 5989bc4c6e83a73626f7ca36f2bda3ba04b8e024 /databases/percona57-client/files/patch-scripts_CMakeLists.txt | |
| parent | security/vuxml: Fix FreeBSD PR bugs references (diff) | |
databases/percona57-{client,pam-for-mysql,server}: Update to 5.7.20-18
Release notes: https://www.percona.com/doc/percona-server/5.7/release-notes/Percona-Server-5.7.20-18.html
MFH: 2017Q4
Diffstat (limited to 'databases/percona57-client/files/patch-scripts_CMakeLists.txt')
| -rw-r--r-- | databases/percona57-client/files/patch-scripts_CMakeLists.txt | 27 |
1 files changed, 16 insertions, 11 deletions
diff --git a/databases/percona57-client/files/patch-scripts_CMakeLists.txt b/databases/percona57-client/files/patch-scripts_CMakeLists.txt index bdb577cf274b..144cbaaf45e3 100644 --- a/databases/percona57-client/files/patch-scripts_CMakeLists.txt +++ b/databases/percona57-client/files/patch-scripts_CMakeLists.txt @@ -1,23 +1,24 @@ ---- scripts/CMakeLists.txt.orig 2016-11-27 19:44:54 UTC -+++ scripts/CMakeLists.txt -@@ -19,7 +19,7 @@ IF(NOT CMAKE_CROSSCOMPILING) - TARGET_LINK_LIBRARIES(comp_sql) - ENDIF() +--- scripts/CMakeLists.txt.orig 2017-12-11 07:56:49.000000000 +0000 ++++ scripts/CMakeLists.txt 2017-12-31 14:31:35.649012000 +0000 +@@ -23,6 +23,7 @@ + SET(COMPILER_ID_AND_VERSION + "${CMAKE_CXX_COMPILER_ID} ${CMAKE_CXX_COMPILER_VERSION}") -- +IF(FALSE) # Build mysql_fix_privilege_tables.sql (concatenate 2 sql scripts) IF(NOT WIN32 OR CMAKE_CROSSCOMPILING) FIND_PROGRAM(CAT_EXECUTABLE cat DOC "path to the executable") -@@ -63,6 +63,7 @@ ADD_CUSTOM_TARGET(GenFixPrivs +@@ -65,7 +66,9 @@ + ALL DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/mysql_fix_privilege_tables_sql.c ${CMAKE_CURRENT_BINARY_DIR}/sql_commands_sys_schema.h ++ENDIF() ) +ENDIF() # If we do not have performance schema compiled in then sys will not work, # so only create an empty sys database with an auto-generated file, -@@ -143,6 +144,7 @@ IF(NOT WITHOUT_SERVER) +@@ -146,6 +149,7 @@ ) ENDIF() @@ -25,7 +26,7 @@ IF(UNIX) FILE(WRITE ${CMAKE_CURRENT_BINARY_DIR}/make_binary_distribution "cd ${CMAKE_BINARY_DIR} && '${CMAKE_CPACK_COMMAND}' -G TGZ --config CPackConfig.cmake\n" ) -@@ -150,6 +152,7 @@ IF(UNIX) +@@ -153,6 +157,7 @@ COMMAND chmod +x ${CMAKE_CURRENT_BINARY_DIR}/make_binary_distribution ) ENDIF() @@ -33,7 +34,7 @@ IF(NOT WITHOUT_SERVER) INSTALL(FILES -@@ -347,6 +350,8 @@ MACRO(EXTRACT_LINK_LIBRARIES target var) +@@ -332,6 +337,8 @@ GET_FILENAME_COMPONENT(lib "${lib}" NAME_WE) STRING(REGEX REPLACE "^lib" "" lib "${lib}") SET(${var} "${${var}}-l${lib} " ) @@ -42,7 +43,7 @@ ELSE() SET(${var} "${${var}}-l${lib} " ) ENDIF() -@@ -430,21 +435,7 @@ ELSE() +@@ -417,25 +424,7 @@ # On Unix, most of the files end up in the bin directory SET(mysql_config_COMPONENT COMPONENT Development) @@ -51,6 +52,8 @@ - mysql_config - mysqldumpslow - ps_tokudb_admin +- ps_mysqld_helper +- ps-admin - ) - ELSE() - SET(BIN_SCRIPTS @@ -59,6 +62,8 @@ - mysqld_multi - mysqld_safe - ps_tokudb_admin +- ps_mysqld_helper +- ps-admin - ) - ENDIF() + SET(BIN_SCRIPTS mysql_config) |