diff options
| author | Sergei Golubchik <serg@mariadb.org> | 2019-01-02 19:33:52 +0100 |
|---|---|---|
| committer | Sergei Golubchik <serg@mariadb.org> | 2019-01-03 00:23:06 +0100 |
| commit | 2f368bb967795de5b96f21ff9d12c847df86029f (patch) | |
| tree | 000ef128a81ece295bd1f8d21a2edaf8ea5810c7 | |
| parent | cf8a564686666d9f69dc101fecba85a4ef6b0342 (diff) | |
| download | mariadb-git-2f368bb967795de5b96f21ff9d12c847df86029f.tar.gz | |
fix RHEL8 "ambiguous python shebang" build failures
| -rw-r--r-- | CMakeLists.txt | 1 | ||||
| -rw-r--r-- | cmake/cpack_rpm.cmake | 2 | ||||
| -rw-r--r-- | storage/rocksdb/CMakeLists.txt | 4 | ||||
| -rwxr-xr-x | storage/rocksdb/myrocks_hotbackup.py (renamed from storage/rocksdb/myrocks_hotbackup) | 2 |
4 files changed, 7 insertions, 2 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index 90fadcec839..d1d12869a70 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -330,6 +330,7 @@ MYSQL_CHECK_SSL() MYSQL_CHECK_READLINE() SET(MALLOC_LIBRARY "system") +SET(PYTHON_SHEBANG "/usr/bin/env python") CHECK_PCRE() diff --git a/cmake/cpack_rpm.cmake b/cmake/cpack_rpm.cmake index b88d5634483..6bc0cc81ada 100644 --- a/cmake/cpack_rpm.cmake +++ b/cmake/cpack_rpm.cmake @@ -219,6 +219,8 @@ ELSEIF(RPM MATCHES "fedora" OR RPM MATCHES "(rhel|centos)7") ALTERNATIVE_NAME("server" "mariadb-server") ALTERNATIVE_NAME("server" "mysql-compat-server") ALTERNATIVE_NAME("test" "mariadb-test") +ELSEIF(RPM MATCHES "(rhel|centos)8") + SET(PYTHON_SHEBANG "/usr/bin/python3") ENDIF() # workaround for lots of perl dependencies added by rpmbuild diff --git a/storage/rocksdb/CMakeLists.txt b/storage/rocksdb/CMakeLists.txt index 2689dc7151c..acbab49c586 100644 --- a/storage/rocksdb/CMakeLists.txt +++ b/storage/rocksdb/CMakeLists.txt @@ -217,7 +217,9 @@ TARGET_LINK_LIBRARIES(sst_dump rocksdblib) MYSQL_ADD_EXECUTABLE(mysql_ldb tools/mysql_ldb.cc COMPONENT rocksdb-engine) TARGET_LINK_LIBRARIES(mysql_ldb rocksdb_tools rocksdb_aux_lib) -INSTALL_SCRIPT(myrocks_hotbackup COMPONENT rocksdb-engine) +CONFIGURE_FILE(${CMAKE_CURRENT_SOURCE_DIR}/myrocks_hotbackup.py + ${CMAKE_CURRENT_BINARY_DIR}/myrocks_hotbackup @ONLY) +INSTALL_SCRIPT(${CMAKE_CURRENT_BINARY_DIR}/myrocks_hotbackup COMPONENT rocksdb-engine) IF(CMAKE_CXX_COMPILER_ID MATCHES "GNU" OR CMAKE_CXX_COMPILER_ID MATCHES "Clang") SET_TARGET_PROPERTIES(rocksdb_tools sst_dump mysql_ldb PROPERTIES COMPILE_FLAGS -frtti) diff --git a/storage/rocksdb/myrocks_hotbackup b/storage/rocksdb/myrocks_hotbackup.py index ef1e934f3fd..69c75b7cbfd 100755 --- a/storage/rocksdb/myrocks_hotbackup +++ b/storage/rocksdb/myrocks_hotbackup.py @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#!@PYTHON_SHEBANG@ from __future__ import division from optparse import OptionParser |