diff options
| author |   Kai Kang <kai.kang@windriver.com> | 2019-11-20 16:36:38 +0800 |
|---|---|---|
| committer |   Khem Raj <raj.khem@gmail.com> | 2019-11-20 06:57:27 -0800 |
| commit | b69e4d8b2ea6d2dc72f89f40744ebdc24cb6f323 (patch) | |
| tree | 41c8181d2c8ba23052da2cf85f1d317e5c41a030 /meta-oe/recipes-dbs/mysql | |
| parent | 95bddd89fefb3c9dc00dccf02107fae175ef17cf (diff) | |
| download | meta-openembedded-b69e4d8b2ea6d2dc72f89f40744ebdc24cb6f323.tar.gz | |
mariadb: replace dependency readline with libedit
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.
Signed-off-by: Kai Kang <kai.kang@windriver.com>
Signed-off-by: Khem Raj <raj.khem@gmail.com>
Diffstat (limited to 'meta-oe/recipes-dbs/mysql')
| -rw-r--r-- | meta-oe/recipes-dbs/mysql/mariadb.inc | 1 | ||||
| -rw-r--r-- | meta-oe/recipes-dbs/mysql/mariadb_10.3.18.bb | 2 |
2 files changed, 1 insertions, 2 deletions
diff --git a/meta-oe/recipes-dbs/mysql/mariadb.inc b/meta-oe/recipes-dbs/mysql/mariadb.inc index e1ae58ae7a..ec5ac11ef0 100644 --- a/meta-oe/recipes-dbs/mysql/mariadb.inc +++ b/meta-oe/recipes-dbs/mysql/mariadb.inc @@ -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" diff --git a/meta-oe/recipes-dbs/mysql/mariadb_10.3.18.bb b/meta-oe/recipes-dbs/mysql/mariadb_10.3.18.bb index de24c920f0..c0b53379d9 100644 --- a/meta-oe/recipes-dbs/mysql/mariadb_10.3.18.bb +++ b/meta-oe/recipes-dbs/mysql/mariadb_10.3.18.bb @@ -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" |