NetCube-Systems-Austria/kumquat-buildroot
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

package/mariadb: needs fmt

Browse Source 
Buildroot commit 88c7359f65 bumped mariadb
from version 10.3.36 to 10.11.4.

Upstream added fmt as dependency in version 10.7.1 with commit
e214e60201

Fixes:
http://autobuild.buildroot.net/results/ce1/ce140a3923bc2f85b176fafcc38c6f68b177d33a/

Signed-off-by: Bernd Kuhls <bernd@kuhls.net>
Signed-off-by: Yann E. MORIN <yann.morin.1998@free.fr>
This commit is contained in:
Bernd Kuhls 2023-07-21 23:25:44 +02:00 committed by Yann E. MORIN
parent a42b52163d
commit 821f9dee81
2 changed files with 10 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
package/mariadb/mariadb.mk
View File

@ -18,12 +18,16 @@ MARIADB_CONFIG_SCRIPTS = mysql_config
MARIADB_DEPENDENCIES = \ MARIADB_DEPENDENCIES = \
host-mariadb \ host-mariadb \
fmt \
ncurses \ ncurses \
openssl \ openssl \
zlib \ zlib \
libaio \ libaio \
libxml2 libxml2
MARIADB_CONF_OPTS += \
-DWITH_FMT=system
# use bundled GPL-2.0+ licensed readline as package/readline is GPL-3.0+ # use bundled GPL-2.0+ licensed readline as package/readline is GPL-3.0+
MARIADB_CONF_OPTS += -DWITH_READLINE=ON MARIADB_CONF_OPTS += -DWITH_READLINE=ON

8
package/mysql/Config.in
View File

@ -16,10 +16,13 @@ choice
config BR2_PACKAGE_MARIADB config BR2_PACKAGE_MARIADB
bool "mariadb" bool "mariadb"
depends on BR2_INSTALL_LIBSTDCPP # fmt
depends on !BR2_STATIC_LIBS depends on !BR2_STATIC_LIBS
depends on BR2_TOOLCHAIN_HAS_ATOMIC || BR2_TOOLCHAIN_HAS_SYNC_8 depends on BR2_TOOLCHAIN_HAS_ATOMIC || BR2_TOOLCHAIN_HAS_SYNC_8
depends on BR2_USE_WCHAR # fmt
select BR2_PACKAGE_LIBAIO select BR2_PACKAGE_LIBAIO
select BR2_PACKAGE_LIBXML2 select BR2_PACKAGE_LIBXML2
select BR2_PACKAGE_FMT
select BR2_PACKAGE_NCURSES select BR2_PACKAGE_NCURSES
select BR2_PACKAGE_OPENSSL select BR2_PACKAGE_OPENSSL
select BR2_PACKAGE_HAS_MYSQL select BR2_PACKAGE_HAS_MYSQL
@ -30,8 +33,9 @@ config BR2_PACKAGE_MARIADB
http://www.mariadb.org/ http://www.mariadb.org/
comment "mariadb needs a toolchain w/ dynamic library" comment "mariadb needs a toolchain w/ dynamic library, C++, wchar"
depends on BR2_STATIC_LIBS depends on BR2_STATIC_LIBS || !BR2_INSTALL_LIBSTDCPP \
|| !BR2_USE_WCHAR
depends on BR2_TOOLCHAIN_HAS_ATOMIC || BR2_TOOLCHAIN_HAS_SYNC_8 depends on BR2_TOOLCHAIN_HAS_ATOMIC || BR2_TOOLCHAIN_HAS_SYNC_8
config BR2_PACKAGE_ORACLE_MYSQL config BR2_PACKAGE_ORACLE_MYSQL