diff options
| author | Sergei Golubchik <serg@mariadb.org> | 2020-03-14 21:13:23 +0100 |
|---|---|---|
| committer | Sergei Golubchik <serg@mariadb.org> | 2020-03-16 01:13:01 +0100 |
| commit | 9bd583ce1f313491018b83290452ac28674093d3 (patch) | |
| tree | 0ea148f814f5e677cce7e0a65699e86b8b916543 | |
| parent | b6b69806867b88f3aab82c34a3a881931628ef9e (diff) | |
| download | mariadb-git-9bd583ce1f313491018b83290452ac28674093d3.tar.gz | |
MDEV-21942 Building 10.5 requires Internet access
Force correct PCRE2 linking in the official binaries.
System pcre2 in RPM/DEB, bundled in bintars.
| -rw-r--r-- | cmake/build_configurations/mysql_release.cmake | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/cmake/build_configurations/mysql_release.cmake b/cmake/build_configurations/mysql_release.cmake index ef969ee5f20..d128416d966 100644 --- a/cmake/build_configurations/mysql_release.cmake +++ b/cmake/build_configurations/mysql_release.cmake @@ -96,6 +96,8 @@ 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 "") ELSEIF(DEB) SET(WITH_SSL system CACHE STRING "") SET(WITH_ZLIB system CACHE STRING "") @@ -103,12 +105,14 @@ ELSEIF(DEB) SET(HAVE_EMBEDDED_PRIVILEGE_CONTROL ON) SET(PLUGIN_AUTH_SOCKET YES CACHE STRING "") SET(WITH_EMBEDDED_SERVER ON CACHE BOOL "") + SET(WITH_PCRE system CACHE STRING "") ELSE() SET(WITH_SSL bundled CACHE STRING "") SET(WITH_ZLIB bundled CACHE STRING "") 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 "") ENDIF() IF(NOT COMPILATION_COMMENT) |