* [Buildroot] [PATCH v2 1/2] package/mariadb: needs fmt
@ 2023-07-21 21:25 Bernd Kuhls
2023-07-21 21:25 ` [Buildroot] [PATCH v2 2/2] package/mariadb: needs pcre2 Bernd Kuhls
2023-07-23 15:41 ` [Buildroot] [PATCH v2 1/2] package/mariadb: needs fmt Yann E. MORIN
0 siblings, 2 replies; 5+ messages in thread
From: Bernd Kuhls @ 2023-07-21 21:25 UTC (permalink / raw)
To: buildroot
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 <bernd@kuhls.net>
---
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
^ permalink raw reply related [flat|nested] 5+ messages in thread
* [Buildroot] [PATCH v2 2/2] package/mariadb: needs pcre2
2023-07-21 21:25 [Buildroot] [PATCH v2 1/2] package/mariadb: needs fmt Bernd Kuhls
@ 2023-07-21 21:25 ` Bernd Kuhls
2023-07-23 15:43 ` Yann E. MORIN
2023-07-23 15:41 ` [Buildroot] [PATCH v2 1/2] package/mariadb: needs fmt Yann E. MORIN
1 sibling, 1 reply; 5+ messages in thread
From: Bernd Kuhls @ 2023-07-21 21:25 UTC (permalink / raw)
To: buildroot
Upstream added the possibility to build with system-provided pcre2
https://github.com/MariaDB/server/commit/016bd4fc5fff311dc4091b3b7329cd980dbaa14b
Signed-off-by: Bernd Kuhls <bernd@kuhls.net>
---
v2: no changes
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
--
2.39.2
_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot
^ permalink raw reply related [flat|nested] 5+ messages in thread
* Re: [Buildroot] [PATCH v2 2/2] package/mariadb: needs pcre2
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
0 siblings, 1 reply; 5+ messages in thread
From: Yann E. MORIN @ 2023-07-23 15:43 UTC (permalink / raw)
To: Bernd Kuhls; +Cc: buildroot
Bernd, All,
+Peter K. for backports.
On 2023-07-21 23:25 +0200, Bernd Kuhls spake thusly:
> Upstream added the possibility to build with system-provided pcre2
> https://github.com/MariaDB/server/commit/016bd4fc5fff311dc4091b3b7329cd980dbaa14b
This commit dates back to 2014, and we introduced mariadb in Buildroot
in 2016, so the possibility to use a system-provided pcre2 was already
present in Buildroot.
Peter:
So, this commit should be backported to stable branches.
Applied to master, thanks.
Regards,
Yann E. MORIN.
> Signed-off-by: Bernd Kuhls <bernd@kuhls.net>
> ---
> v2: no changes
>
> 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
> --
> 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
^ permalink raw reply [flat|nested] 5+ messages in thread* Re: [Buildroot] [PATCH v2 2/2] package/mariadb: needs pcre2
2023-07-23 15:43 ` Yann E. MORIN
@ 2023-08-29 20:32 ` Peter Korsgaard
0 siblings, 0 replies; 5+ messages in thread
From: Peter Korsgaard @ 2023-08-29 20:32 UTC (permalink / raw)
To: Yann E. MORIN; +Cc: Bernd Kuhls, buildroot
>>>>> "Yann" == Yann E MORIN <yann.morin.1998@free.fr> writes:
> Bernd, All,
> +Peter K. for backports.
> On 2023-07-21 23:25 +0200, Bernd Kuhls spake thusly:
>> Upstream added the possibility to build with system-provided pcre2
>> https://github.com/MariaDB/server/commit/016bd4fc5fff311dc4091b3b7329cd980dbaa14b
> This commit dates back to 2014, and we introduced mariadb in Buildroot
> in 2016, so the possibility to use a system-provided pcre2 was already
> present in Buildroot.
> Peter:
> So, this commit should be backported to stable branches.
From a quick test, it doesn't seem to work with the 10.3.x version we
have in 2023.02.x / 2023.05.x, so I've skipped it for now.
--
Bye, Peter Korsgaard
_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot
^ permalink raw reply [flat|nested] 5+ messages in thread
* Re: [Buildroot] [PATCH v2 1/2] package/mariadb: needs fmt
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:41 ` Yann E. MORIN
1 sibling, 0 replies; 5+ messages in thread
From: Yann E. MORIN @ 2023-07-23 15:41 UTC (permalink / raw)
To: Bernd Kuhls; +Cc: buildroot
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
^ permalink raw reply [flat|nested] 5+ messages in thread
end of thread, other threads:[~2023-08-29 20:32 UTC | newest]
Thread overview: 5+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
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 ` [Buildroot] [PATCH v2 1/2] package/mariadb: needs fmt Yann E. MORIN
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.