summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSergei Golubchik <serg@mariadb.org>2021-11-05 15:12:14 +0100
committerSergei Golubchik <serg@mariadb.org>2021-12-07 21:31:13 +0100
commite27b1c31378a6d2592b8ffafb0c7fcc5a1c93072 (patch)
treecfd04fe605f6c3decc9fbcd62f31f750fb27acff
parent88ac91c7cc18425b56e3285c7e533b00af5b8281 (diff)
downloadmariadb-git-e27b1c31378a6d2592b8ffafb0c7fcc5a1c93072.tar.gz
require system pcre2 in rpms
now when SLES12.3 is gone, we can enforce it
-rw-r--r--cmake/build_configurations/mysql_release.cmake4
1 files changed, 1 insertions, 3 deletions
diff --git a/cmake/build_configurations/mysql_release.cmake b/cmake/build_configurations/mysql_release.cmake
index 97c59eb3ca4..11913da2589 100644
--- a/cmake/build_configurations/mysql_release.cmake
+++ b/cmake/build_configurations/mysql_release.cmake
@@ -106,8 +106,7 @@ ELSEIF(RPM)
SET(SEMODULE_PACKAGE /usr/bin/semodule_package CACHE FILEPATH "")
SET(PLUGIN_AUTH_SOCKET YES CACHE STRING "")
SET(WITH_EMBEDDED_SERVER ON CACHE BOOL "")
- # not yet, SLES 12.3 doesn't provide pcre2
- #SET(WITH_PCRE system CACHE STRING "")
+ SET(WITH_PCRE system CACHE STRING "")
IF(RPM MATCHES "fedora|centos|rhel")
SET(WITH_INNODB_BZIP2 OFF CACHE STRING "")
SET(WITH_INNODB_LZO OFF CACHE STRING "")
@@ -137,7 +136,6 @@ ELSE()
SET(WITH_JEMALLOC static CACHE STRING "")
SET(PLUGIN_AUTH_SOCKET STATIC CACHE STRING "")
SET(WITH_STRIPPED_CLIENT ON CACHE BOOL "Strip all client binaries")
- SET(WITH_PCRE bundled CACHE STRING "")
SET(WITH_INNODB_BZIP2 OFF CACHE STRING "")
SET(WITH_INNODB_LZ4 OFF CACHE STRING "")
SET(WITH_INNODB_LZO OFF CACHE STRING "")