Home Explore Help
Sign In
PUBLIC_REPOS
/
buildroot
mirror of git://git.buildroot.net/buildroot
2
1
Fork 0
Files
Browse Source

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>
Peter Korsgaard 5 years ago
parent
be72d8c9e6
commit
29cdf119f3
2 changed files with 4 additions and 3 deletions
Unified View Show Diff Stats
  1. 4 2
      package/mariadb/mariadb.mk
  2. 0 1
      package/mysql/Config.in

+ 4 - 2
package/mariadb/mariadb.mk
View File 

@@ -19,8 +19,10 @@ MARIADB_DEPENDENCIES = \
 
 	openssl \
 
 	openssl \
 
 	zlib \
 
 	zlib \
 
 	libaio \
 
 	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
 
 # We won't need unit tests
 
 MARIADB_CONF_OPTS += -DWITH_UNIT_TESTS=0
 
 MARIADB_CONF_OPTS += -DWITH_UNIT_TESTS=0

+ 0 - 1
package/mysql/Config.in
View File 

@@ -22,7 +22,6 @@ config BR2_PACKAGE_MARIADB
 
 	select BR2_PACKAGE_LIBXML2
 
 	select BR2_PACKAGE_LIBXML2
 
 	select BR2_PACKAGE_NCURSES
 
 	select BR2_PACKAGE_NCURSES
 
 	select BR2_PACKAGE_OPENSSL
 
 	select BR2_PACKAGE_OPENSSL
 
-	select BR2_PACKAGE_READLINE
 
 	select BR2_PACKAGE_HAS_MYSQL
 
 	select BR2_PACKAGE_HAS_MYSQL
 
 	help
 
 	help
 
 	  MariaDB is one of the most popular database servers in the
 
 	  MariaDB is one of the most popular database servers in the