Re: [Buildroot] [PATCH v2 2/2] package/mariadb: needs pcre2

["Yann E. MORIN" <yann.morin.1998@free.fr>]

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