package/mariadb: use bundled GPL-2.0+ libreadline

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>
Signed-off-by: Yann E. MORIN <yann.morin.1998@free.fr>

diff --git a/package/mariadb/mariadb.mk b/package/mariadb/mariadb.mk
index 6a18db48ab08b1746fc98860c07732770e020e37..82e3c16dafd0b4d53515a747aed3b568d168c2a4 100644 (file)
--- 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 30a82cc91bed8b7270723ebe00faa5c716e08879..d3f9f1f00d8310fe3c53286058942ad49d1442d9 100644 (file)
--- 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