From 263f8aff651edf1e43e385b7390c0e67ae51d358 Mon Sep 17 00:00:00 2001 From: Sergei Golubchik Date: Sat, 27 Jun 2020 18:44:00 +0200 Subject: [PATCH] always use python3 because columnstore uses python3, so rocksdb can be picky too. python3 is present in all supported distros. and python2 is obsolete anyway. --- CMakeLists.txt | 2 +- cmake/cpack_deb.cmake | 1 + cmake/cpack_rpm.cmake | 4 +--- 3 files changed, 3 insertions(+), 4 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 898119f00b6..c52d6621bb1 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -425,7 +425,7 @@ INCLUDE(mariadb_connector_c) # this does ADD_SUBDIRECTORY(libmariadb) INCLUDE(cpack_rpm) INCLUDE(cpack_deb) -SET(PYTHON_SHEBANG "/usr/bin/env python" CACHE STRING "python shebang") +SET(PYTHON_SHEBANG "/usr/bin/env python3" CACHE STRING "python shebang") MARK_AS_ADVANCED(PYTHON_SHEBANG) # Add storage engines and plugins. diff --git a/cmake/cpack_deb.cmake b/cmake/cpack_deb.cmake index 22985e5ac56..0539bcdff23 100644 --- a/cmake/cpack_deb.cmake +++ b/cmake/cpack_deb.cmake @@ -6,5 +6,6 @@ IF(DEB) SET(CPACK_COMPONENT_SERVER_GROUP "server") SET(CPACK_COMPONENT_README_GROUP "server") SET(CPACK_COMPONENTS_ALL Server Test SharedLibraries) +SET(PYTHON_SHEBANG "/usr/bin/python3" CACHE STRING "python shebang") ENDIF(DEB) diff --git a/cmake/cpack_rpm.cmake b/cmake/cpack_rpm.cmake index be0252e36a4..662edbcb67d 100644 --- a/cmake/cpack_rpm.cmake +++ b/cmake/cpack_rpm.cmake @@ -249,9 +249,7 @@ ELSEIF(RPM MATCHES "sles") "mariadb-server = %{version}-%{release}" ) ENDIF() -IF(RPM MATCHES "fedora31" OR RPM MATCHES "(rhel|centos)8") - SET(PYTHON_SHEBANG "/usr/bin/python3" CACHE STRING "python shebang") -ENDIF() +SET(PYTHON_SHEBANG "/usr/bin/python3" CACHE STRING "python shebang") # If we want to build build MariaDB-shared-compat, # extract compat libraries from MariaDB-shared-5.3 rpm