mirror of
https://github.com/openwrt/packages.git
synced 2025-12-24 10:38:21 +04:00
mariadb: bump to major version 10.4
Highlights: - Bump from 10.2.26 to 10.4.10 - auth_pam got replaced with never version, old one still available as auth_pam_v1 - semisync plugins were merged into the core - Upstream now installs symlinks for binaries with mariadb prefix. To accommodate that this commit updates Package/mariadb/install/bin accordingly. - Patches are updated with new ones from Debian and Arch (thanks!) - libedit patch dropped because it's upstream now. Signed-off-by: Sebastian Kemper <sebastian_ml@gmx.net>
This commit is contained in:
@@ -1,11 +1,36 @@
|
||||
From: =?utf-8?q?Ond=C5=99ej_Sur=C3=BD?= <ondrej@debian.org>
|
||||
Date: Wed, 22 Nov 2017 06:05:45 +0000
|
||||
Subject: Revert to using system pcre library
|
||||
|
||||
---
|
||||
cmake/pcre.cmake | 16 ++--------------
|
||||
1 file changed, 2 insertions(+), 14 deletions(-)
|
||||
|
||||
--- a/cmake/pcre.cmake
|
||||
+++ b/cmake/pcre.cmake
|
||||
@@ -14,6 +14,8 @@ MACRO (CHECK_PCRE)
|
||||
return -pcre_exec(NULL, NULL, NULL, -999, -999, 0, NULL, 0) < 256;
|
||||
}" PCRE_STACK_SIZE_OK)
|
||||
SET(CMAKE_REQUIRED_LIBRARIES)
|
||||
+ ELSE()
|
||||
+ SET(PCRE_STACK_SIZE_OK TRUE)
|
||||
ENDIF()
|
||||
@@ -1,23 +1,11 @@
|
||||
-INCLUDE (CheckCSourceRuns)
|
||||
-
|
||||
SET(WITH_PCRE "auto" CACHE STRING
|
||||
"Which pcre to use (possible values are 'bundled', 'system', or 'auto')")
|
||||
|
||||
MACRO (CHECK_PCRE)
|
||||
IF(WITH_PCRE STREQUAL "system" OR WITH_PCRE STREQUAL "auto")
|
||||
- CHECK_LIBRARY_EXISTS(pcre pcre_stack_guard "" HAVE_PCRE_STACK_GUARD)
|
||||
- IF(NOT CMAKE_CROSSCOMPILING)
|
||||
- SET(CMAKE_REQUIRED_LIBRARIES "pcre")
|
||||
- CHECK_C_SOURCE_RUNS("
|
||||
- #include <pcre.h>
|
||||
- int main() {
|
||||
- return -pcre_exec(NULL, NULL, NULL, -999, -999, 0, NULL, 0) < 256;
|
||||
- }" PCRE_STACK_SIZE_OK)
|
||||
- SET(CMAKE_REQUIRED_LIBRARIES)
|
||||
- ENDIF()
|
||||
+ CHECK_LIBRARY_EXISTS(pcre pcre_stack_guard "" HAVE_PCRE)
|
||||
ENDIF()
|
||||
IF(NOT HAVE_PCRE_STACK_GUARD OR NOT PCRE_STACK_SIZE_OK OR
|
||||
- IF(NOT HAVE_PCRE_STACK_GUARD OR NOT PCRE_STACK_SIZE_OK OR
|
||||
- WITH_PCRE STREQUAL "bundled")
|
||||
+ IF(NOT HAVE_PCRE OR WITH_PCRE STREQUAL "bundled")
|
||||
IF (WITH_PCRE STREQUAL "system")
|
||||
MESSAGE(FATAL_ERROR "system pcre is not found or unusable")
|
||||
ENDIF()
|
||||
|
||||
Reference in New Issue
Block a user