aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGravatar Peter Korsgaard <peter@korsgaard.com>2019-11-13 16:17:21 +0100
committerGravatar Yann E. MORIN <yann.morin.1998@free.fr>2019-11-13 21:47:51 +0100
commit29cdf119f33538fb90c36e42966c1a7693389190 (patch)
tree938f1afef659dec448d54780b1aeedd4565a730c
parentbe72d8c9e620d64a177c17a1611ecd9b3dfbdbcd (diff)
downloadbuildroot-29cdf119f33538fb90c36e42966c1a7693389190.tar.gz
buildroot-29cdf119f33538fb90c36e42966c1a7693389190.tar.bz2
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>
-rw-r--r--package/mariadb/mariadb.mk6
-rw-r--r--package/mysql/Config.in1
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