From 15cc8d1e453d8c9e20389c8908c024f03f826388 Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Fri, 21 Jul 2023 23:25:45 +0200 Subject: [PATCH] package/mariadb: needs pcre2 Upstream added the possibility to build with system-provided pcre2 back in 2014: https://github.com/MariaDB/server/commit/016bd4fc5fff311dc4091b3b7329cd980dbaa14b The policy in Buildroot is to use system-provided libraries rather than bundled ones, but we missed that opportunity when we introduced mariadb back in 2016, with commit 2cd86cdbfcde (mariadb: new package). Fix that now. Signed-off-by: Bernd Kuhls Signed-off-by: Yann E. MORIN --- package/mariadb/mariadb.mk | 4 +++- package/mysql/Config.in | 1 + 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/package/mariadb/mariadb.mk b/package/mariadb/mariadb.mk index a9cd9c9516..a2701643e1 100644 --- a/package/mariadb/mariadb.mk +++ b/package/mariadb/mariadb.mk @@ -21,12 +21,14 @@ MARIADB_DEPENDENCIES = \ fmt \ ncurses \ openssl \ + pcre2 \ zlib \ libaio \ libxml2 MARIADB_CONF_OPTS += \ - -DWITH_FMT=system + -DWITH_FMT=system \ + -DWITH_PCRE=system # use bundled GPL-2.0+ licensed readline as package/readline is GPL-3.0+ MARIADB_CONF_OPTS += -DWITH_READLINE=ON diff --git a/package/mysql/Config.in b/package/mysql/Config.in index 8212d0fd3f..8942e55a45 100644 --- a/package/mysql/Config.in +++ b/package/mysql/Config.in @@ -25,6 +25,7 @@ config BR2_PACKAGE_MARIADB select BR2_PACKAGE_FMT select BR2_PACKAGE_NCURSES select BR2_PACKAGE_OPENSSL + select BR2_PACKAGE_PCRE2 select BR2_PACKAGE_HAS_MYSQL help MariaDB is one of the most popular database servers in the