Skip to contentSkip to conversation

mariadb: replace dependency readline with libedit

PATCH New [email protected] 1 participant 1 message Nov 20, 2019

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 mariadb: replace dependency readline with libedit

From: Kai Kang <[email protected]>

Because readline changed its license to GPLv3 from version 6.0, if build mariadb for distribution, it skips readline and turns to libedit. If no libedit available, it uses bundled readline in the source code finally. There is readline 8.0 in oe-core, so remove dependency readline and use libedit instead.

---
 meta-oe/recipes-dbs/mysql/mariadb.inc        | 1 -
 meta-oe/recipes-dbs/mysql/mariadb_10.3.18.bb | 2 +-
 2 files changed, 1 insertion(+), 2 deletions(-)
meta-oe/recipes-dbs/mysql/mariadb.inc +0 -1
index e1ae58ae7..ec5ac11ef 100644
@@ -58,7 +58,6 @@ PACKAGECONFIG ??= "${@bb.utils.filter('DISTRO_FEATURES', 'pam', d)} setupdb"
 PACKAGECONFIG_class-native = ""
 PACKAGECONFIG[pam] = ",-DWITHOUT_AUTH_PAM=TRUE,libpam"
 PACKAGECONFIG[valgrind] = "-DWITH_VALGRIND=TRUE,-DWITH_VALGRIND=FALSE,valgrind"
-PACKAGECONFIG[libedit] = "-DLIBEDIT_INTERFACE=TRUE,-DLIBEDIT_INTERFACE=FALSE,libedit"
 PACKAGECONFIG[krb5] = ", ,krb5"
 PACKAGECONFIG[setupdb] = ", ,,${PN}-setupdb"
 
meta-oe/recipes-dbs/mysql/mariadb_10.3.18.bb +1 -1
index de24c920f..c0b53379d 100644
@@ -2,7 +2,7 @@ require mariadb.inc
 
 EXTRA_OECMAKE += "-DSTACK_DIRECTION=-1"
 
-DEPENDS += "mariadb-native bison-native openssl ncurses zlib readline libaio libevent libxml2"
+DEPENDS += "mariadb-native bison-native openssl ncurses zlib libaio libedit libevent libxml2"
 
 PROVIDES += "mysql5 libmysqlclient"
 
Signature · 1 line
2.17.1