ecb40d449c
Removal of the galera patch, it has been upstreamed Build TokuDB with jemalloc; jemalloc 5 support introduced by upstream; #1583853 Allow very few tests to fail the testsuite; this won't block builds on unstable tests
41 lines
1.3 KiB
Diff
41 lines
1.3 KiB
Diff
We have some downstream patches and other scripts that include variables to
|
|
be expanded by cmake. Cmake needs to know about them, so adding them manually.
|
|
|
|
--- mariadb-10.3.8/scripts/CMakeLists.txt 2018-07-02 09:34:11.000000000 +0200
|
|
+++ mariadb-10.3.8/scripts/CMakeLists.txt_patched 2018-07-03 10:58:15.954670153 +0200
|
|
@@ -361,6 +361,34 @@ ELSE()
|
|
COMPONENT ${${file}_COMPONENT}
|
|
)
|
|
ENDFOREACH()
|
|
+
|
|
+ # files for systemd
|
|
+ SET(SYSTEMD_SCRIPTS
|
|
+ mysql.tmpfiles.d
|
|
+ mysql.service
|
|
+ mysql@.service
|
|
+ mysql-prepare-db-dir
|
|
+ mysql-check-socket
|
|
+ mysql-check-upgrade
|
|
+ mysql-scripts-common
|
|
+ mysql_config_multilib
|
|
+ clustercheck
|
|
+ galera_new_cluster
|
|
+ my.cnf
|
|
+ )
|
|
+ FOREACH(file ${SYSTEMD_SCRIPTS})
|
|
+ IF(EXISTS ${CMAKE_CURRENT_SOURCE_DIR}/${file}.sh)
|
|
+ CONFIGURE_FILE(${CMAKE_CURRENT_SOURCE_DIR}/${file}.sh
|
|
+ ${CMAKE_CURRENT_BINARY_DIR}/${file} ESCAPE_QUOTES @ONLY)
|
|
+ ELSEIF(EXISTS ${CMAKE_CURRENT_SOURCE_DIR}/${file}.in)
|
|
+ CONFIGURE_FILE(${CMAKE_CURRENT_SOURCE_DIR}/${file}.in
|
|
+ ${CMAKE_CURRENT_BINARY_DIR}/${file} ESCAPE_QUOTES @ONLY)
|
|
+ ELSE()
|
|
+ MESSAGE(FATAL_ERROR "Can not find ${file}.sh or ${file}.in in "
|
|
+ "${CMAKE_CURRENT_SOURCE_DIR}" )
|
|
+ ENDIF()
|
|
+ ENDFOREACH()
|
|
+
|
|
ENDIF()
|
|
|
|
# Install libgcc as mylibgcc.a
|