From mboxrd@z Thu Jan  1 00:00:00 1970
From: Yann E. MORIN <yann.morin.1998@free.fr>
Date: Wed, 13 Nov 2019 22:00:52 +0100
Subject: [Buildroot] [PATCH 08/11] package/mariadb: use bundled GPL-2.0+
 libreadline
In-Reply-To: <20191113151724.12155-9-peter@korsgaard.com>
References: <20191113151724.12155-1-peter@korsgaard.com>
 <20191113151724.12155-9-peter@korsgaard.com>
Message-ID: <20191113210052.GQ3419@scaer>
List-Id: <buildroot.busybox.net>
MIME-Version: 1.0
Content-Type: text/plain; charset="us-ascii"
Content-Transfer-Encoding: 7bit
To: buildroot@busybox.net

Peter, All,

On 2019-11-13 16:17 +0100, Peter Korsgaard spake thusly:
> mariadb is licensed under GPL-2.0, which is not license compatible with
> modern readline (GPL-3.0+), so instead use the bundled older version
> (GPL-2.0+ licensed) of readline instead.
> 
> Signed-off-by: Peter Korsgaard <peter@korsgaard.com>

Applied to master, thanks.

Regards,
Yann E. MORIN.

> ---
>  package/mariadb/mariadb.mk | 6 ++++--
>  package/mysql/Config.in    | 1 -
>  2 files changed, 4 insertions(+), 3 deletions(-)
> 
> diff --git a/package/mariadb/mariadb.mk b/package/mariadb/mariadb.mk
> index 6a18db48ab..82e3c16daf 100644
> --- a/package/mariadb/mariadb.mk
> +++ b/package/mariadb/mariadb.mk
> @@ -19,8 +19,10 @@ MARIADB_DEPENDENCIES = \
>  	openssl \
>  	zlib \
>  	libaio \
> -	libxml2 \
> -	readline
> +	libxml2
> +
> +# use bundled GPL-2.0+ licensed readline as package/readline is GPL-3.0+
> +MARIADB_CONF_OPTS += -DWITH_READLINE=ON
>  
>  # We won't need unit tests
>  MARIADB_CONF_OPTS += -DWITH_UNIT_TESTS=0
> diff --git a/package/mysql/Config.in b/package/mysql/Config.in
> index 30a82cc91b..d3f9f1f00d 100644
> --- a/package/mysql/Config.in
> +++ b/package/mysql/Config.in
> @@ -22,7 +22,6 @@ config BR2_PACKAGE_MARIADB
>  	select BR2_PACKAGE_LIBXML2
>  	select BR2_PACKAGE_NCURSES
>  	select BR2_PACKAGE_OPENSSL
> -	select BR2_PACKAGE_READLINE
>  	select BR2_PACKAGE_HAS_MYSQL
>  	help
>  	  MariaDB is one of the most popular database servers in the
> -- 
> 2.20.1
> 
> _______________________________________________
> buildroot mailing list
> buildroot at busybox.net
> http://lists.busybox.net/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.  |
'------------------------------^-------^------------------^--------------------'