diff options
Diffstat (limited to 'databases/mariadb55-client/files/patch-support-files_CMakeLists.txt')
| -rw-r--r-- | databases/mariadb55-client/files/patch-support-files_CMakeLists.txt | 39 |
1 files changed, 25 insertions, 14 deletions
diff --git a/databases/mariadb55-client/files/patch-support-files_CMakeLists.txt b/databases/mariadb55-client/files/patch-support-files_CMakeLists.txt index e3490b326b03..314bf0b121fe 100644 --- a/databases/mariadb55-client/files/patch-support-files_CMakeLists.txt +++ b/databases/mariadb55-client/files/patch-support-files_CMakeLists.txt @@ -1,6 +1,6 @@ ---- support-files/CMakeLists.txt.orig 2011-01-19 23:37:09.000000000 +0100 -+++ support-files/CMakeLists.txt 2011-02-07 22:52:05.238344276 +0100 -@@ -40,15 +40,18 @@ +--- support-files/CMakeLists.txt.orig 2014-06-13 13:36:52.080474738 +0300 ++++ support-files/CMakeLists.txt 2014-06-13 13:50:59.537282325 +0300 +@@ -41,15 +41,18 @@ SET(inst_location ${INSTALL_SUPPORTFILESDIR}) ENDIF() @@ -15,23 +15,34 @@ IF(UNIX) SET(prefix ${CMAKE_INSTALL_PREFIX}) -+IF(FALSE) - FOREACH(script mysqld_multi.server mysql-log-rotate binary-configure - config.medium.ini config.small.ini config.huge.ini ndb-config-2-node.ini) ++ IF(FALSE) + FOREACH(script mysqld_multi.server mysql-log-rotate binary-configure) CONFIGURE_FILE(${CMAKE_CURRENT_SOURCE_DIR}/${script}.sh -@@ -66,8 +69,10 @@ - IF(INSTALL_SUPPORTFILESDIR) + ${CMAKE_CURRENT_BINARY_DIR}/${script} @ONLY ) +@@ -67,8 +70,10 @@ INSTALL(FILES magic DESTINATION ${inst_location} COMPONENT SupportFiles) + INSTALL(DIRECTORY RHEL4-SElinux/ DESTINATION ${inst_location}/SELinux/RHEL4 COMPONENT SupportFiles) ENDIF() -+ENDIF() ++ ENDIF() INSTALL(FILES mysql.m4 DESTINATION ${INSTALL_SHAREDIR}/aclocal COMPONENT Development) -+IF(FALSE) ++ IF(FALSE) CONFIGURE_FILE(MySQL-shared-compat.spec.sh ${CMAKE_CURRENT_BINARY_DIR}/MySQL-shared-compat.spec @ONLY) CONFIGURE_FILE(mysql.spec.sh ${CMAKE_CURRENT_BINARY_DIR}/mysql.spec @ONLY) - CONFIGURE_FILE(mysql.spec.sh ${CMAKE_CURRENT_BINARY_DIR}/mysql.${VERSION}.spec @ONLY) -@@ -85,3 +90,4 @@ + +@@ -92,6 +97,7 @@ + DESTINATION ${inst_location} COMPONENT SupportFiles PERMISSIONS OWNER_READ OWNER_WRITE OWNER_EXECUTE GROUP_READ GROUP_EXECUTE WORLD_READ WORLD_EXECUTE) - ENDIF() -+ENDIF() ++ + + IF (INSTALL_SYSCONFDIR) + INSTALL(FILES ${CMAKE_CURRENT_BINARY_DIR}/mysql-log-rotate DESTINATION ${INSTALL_SYSCONFDIR}/logrotate.d +@@ -101,6 +107,7 @@ + RENAME mysql COMPONENT SupportFiles + PERMISSIONS OWNER_READ OWNER_WRITE OWNER_EXECUTE GROUP_READ + GROUP_EXECUTE WORLD_READ WORLD_EXECUTE) ++ ENDIF() + + INSTALL(FILES rpm/my.cnf DESTINATION ${INSTALL_SYSCONFDIR} + COMPONENT Common) |