From: "Yann E. MORIN" <yann.morin.1998@free.fr>
To: Bernd Kuhls <bernd@kuhls.net>
Cc: buildroot@buildroot.org
Subject: Re: [Buildroot] [PATCH v2 1/2] package/mariadb: needs fmt
Date: Sun, 23 Jul 2023 17:41:34 +0200 [thread overview]
Message-ID: <20230723154134.GI2503916@scaer> (raw)
In-Reply-To: <20230721212545.2371188-1-bernd@kuhls.net>
Bernd, All,
On 2023-07-21 23:25 +0200, Bernd Kuhls spake thusly:
> 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
So not present in any of the branches in Buildroot but master, so no
need to backport.
> Fixes:
> http://autobuild.buildroot.net/results/ce1/ce140a3923bc2f85b176fafcc38c6f68b177d33a/
>
> Signed-off-by: Bernd Kuhls <bernd@kuhls.net>
Applied to master, thanks.
Regards,
Yann E. MORIN.
> ---
> v2: added note about buildroot commit (Thomas)
>
> 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
> --
> 2.39.2
>
> _______________________________________________
> buildroot mailing list
> buildroot@buildroot.org
> https://lists.buildroot.org/mailman/listinfo/buildroot
--
.-----------------.--------------------.------------------.--------------------.
| Yann E. MORIN | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: |
| +33 662 376 056 | Software Designer | \ / CAMPAIGN | ___ |
| +33 561 099 427 `------------.-------: X AGAINST | \e/ There is no |
| http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL | v conspiracy. |
'------------------------------^-------^------------------^--------------------'
_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot
prev parent reply other threads:[~2023-07-23 15:41 UTC|newest]
Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-07-21 21:25 [Buildroot] [PATCH v2 1/2] package/mariadb: needs fmt Bernd Kuhls
2023-07-21 21:25 ` [Buildroot] [PATCH v2 2/2] package/mariadb: needs pcre2 Bernd Kuhls
2023-07-23 15:43 ` Yann E. MORIN
2023-08-29 20:32 ` Peter Korsgaard
2023-07-23 15:41 ` Yann E. MORIN [this message]
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20230723154134.GI2503916@scaer \
--to=yann.morin.1998@free.fr \
--cc=bernd@kuhls.net \
--cc=buildroot@buildroot.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.