Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
M
MariaDB
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
nexedi
MariaDB
Commits
2f368bb9
Commit
2f368bb9
authored
Jan 02, 2019
by
Sergei Golubchik
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
fix RHEL8 "ambiguous python shebang" build failures
parent
cf8a5646
Changes
4
Show whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
7 additions
and
2 deletions
+7
-2
CMakeLists.txt
CMakeLists.txt
+1
-0
cmake/cpack_rpm.cmake
cmake/cpack_rpm.cmake
+2
-0
storage/rocksdb/CMakeLists.txt
storage/rocksdb/CMakeLists.txt
+3
-1
storage/rocksdb/myrocks_hotbackup.py
storage/rocksdb/myrocks_hotbackup.py
+1
-1
No files found.
CMakeLists.txt
View file @
2f368bb9
...
...
@@ -330,6 +330,7 @@ MYSQL_CHECK_SSL()
MYSQL_CHECK_READLINE
()
SET
(
MALLOC_LIBRARY
"system"
)
SET
(
PYTHON_SHEBANG
"/usr/bin/env python"
)
CHECK_PCRE
()
...
...
cmake/cpack_rpm.cmake
View file @
2f368bb9
...
...
@@ -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
...
...
storage/rocksdb/CMakeLists.txt
View file @
2f368bb9
...
...
@@ -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
)
...
...
storage/rocksdb/myrocks_hotbackup
→
storage/rocksdb/myrocks_hotbackup
.py
View file @
2f368bb9
#!
/usr/bin/env python
#!
@PYTHON_SHEBANG@
from
__future__
import
division
from
optparse
import
OptionParser
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment