From 821f9dee8112dc02fe58d60273d0dfdabbc46d1f Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Fri, 21 Jul 2023 23:25:44 +0200 Subject: [PATCH] package/mariadb: needs fmt Buildroot commit 88c7359f65381d49fa497f9e33bf54bb31a14e6c bumped mariadb from version 10.3.36 to 10.11.4. Upstream added fmt as dependency in version 10.7.1 with commit https://github.com/MariaDB/server/commit/e214e60201216b2e6330f86a84fec8ae14aa2887 Fixes: http://autobuild.buildroot.net/results/ce1/ce140a3923bc2f85b176fafcc38c6f68b177d33a/ Signed-off-by: Bernd Kuhls Signed-off-by: Yann E. MORIN --- package/mariadb/mariadb.mk | 4 ++++ package/mysql/Config.in | 8 ++++++-- 2 files changed, 10 insertions(+), 2 deletions(-) diff --git a/package/mariadb/mariadb.mk b/package/mariadb/mariadb.mk index a743d020c0..a9cd9c9516 100644 --- a/package/mariadb/mariadb.mk +++ b/package/mariadb/mariadb.mk @@ -18,12 +18,16 @@ MARIADB_CONFIG_SCRIPTS = mysql_config MARIADB_DEPENDENCIES = \ host-mariadb \ + fmt \ ncurses \ openssl \ zlib \ libaio \ libxml2 +MARIADB_CONF_OPTS += \ + -DWITH_FMT=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 ef4a9531a7..8212d0fd3f 100644 --- a/package/mysql/Config.in +++ b/package/mysql/Config.in @@ -16,10 +16,13 @@ choice config BR2_PACKAGE_MARIADB bool "mariadb" + depends on BR2_INSTALL_LIBSTDCPP # fmt depends on !BR2_STATIC_LIBS depends on BR2_TOOLCHAIN_HAS_ATOMIC || BR2_TOOLCHAIN_HAS_SYNC_8 + depends on BR2_USE_WCHAR # fmt select BR2_PACKAGE_LIBAIO select BR2_PACKAGE_LIBXML2 + select BR2_PACKAGE_FMT select BR2_PACKAGE_NCURSES select BR2_PACKAGE_OPENSSL select BR2_PACKAGE_HAS_MYSQL @@ -30,8 +33,9 @@ config BR2_PACKAGE_MARIADB http://www.mariadb.org/ -comment "mariadb needs a toolchain w/ dynamic library" - depends on BR2_STATIC_LIBS +comment "mariadb needs a toolchain w/ dynamic library, C++, wchar" + depends on BR2_STATIC_LIBS || !BR2_INSTALL_LIBSTDCPP \ + || !BR2_USE_WCHAR depends on BR2_TOOLCHAIN_HAS_ATOMIC || BR2_TOOLCHAIN_HAS_SYNC_8 config BR2_PACKAGE_ORACLE_MYSQL