database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-07-29 05:21:33 +03:00
Code Activity

Still work on getting the "SPECIFIC-ULN/" files into the build.

Browse Source 
"INSTALL" was wrong, happens too late,
but "CONFIGURE_FILES(... COPYONLY)" should hopefully do it.

Traditional RPMs need to be checked, the above might fix their issues.
This commit is contained in:
Joerg Bruehe
2012-06-12 11:01:41 +02:00
parent 350eef0e1d
commit e28785eb2f
2 changed files with 7 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

29
SPECIFIC-ULN/CMakeLists.txt
View File

@ -26,27 +26,12 @@ IF(UNIX)
# Left in current directory, to be taken during build # Left in current directory, to be taken during build
CONFIGURE_FILE(mysql.spec.sh ${CMAKE_CURRENT_BINARY_DIR}/${SPECFILENAME} @ONLY) CONFIGURE_FILE(mysql.spec.sh ${CMAKE_CURRENT_BINARY_DIR}/${SPECFILENAME} @ONLY)
SET(PATCHES FOREACH(ulnfile filter-requires-mysql.sh generate-tarball.sh my.cnf my_config.h
mysql-5.5-errno.patch mysql-5.5-errno.patch mysql-5.5-fix-tests.patch mysql-5.5-libdir.patch
mysql-5.5-fix-tests.patch mysql-5.5-mtr1.patch mysql-5.5-stack-guard.patch mysql-5.5-testing.patch
mysql-5.5-libdir.patch mysql-chain-certs.patch mysql-embedded-check.c mysql-expired-certs.patch
mysql-5.5-mtr1.patch mysql.init mysql-install-test.patch mysql-strmov.patch scriptstub.c)
mysql-5.5-stack-guard.patch CONFIGURE_FILE(${ulnfile} ${CMAKE_CURRENT_BINARY_DIR}/${ulnfile} COPYONLY)
mysql-5.5-testing.patch ENDFOREACH()
mysql-chain-certs.patch
mysql-expired-certs.patch
mysql-install-test.patch
mysql-strmov.patch)
SET(OTHER
filter-requires-mysql.sh
generate-tarball.sh
my.cnf
my_config.h
mysql-embedded-check.c
mysql.init
scriptstub.c)
INSTALL(FILES ${PATCHES} ${OTHER} DESTINATION ${CMAKE_CURRENT_BINARY_DIR})
ENDIF() ENDIF()

3
support-files/mysql.spec.sh
View File

@ -406,9 +406,6 @@ For a description of MySQL see the base MySQL RPM or http://www.mysql.com/
# Be strict about variables, bail at earliest opportunity, etc. # Be strict about variables, bail at earliest opportunity, etc.
set -eu set -eu
# Get rid of stuff for ULN RPMs - not needed here
rm -fr %{src_dir}/SPECIFIC-ULN/
# Optional package files # Optional package files
touch optional-files-devel touch optional-files-devel