helium-3rd-party/meta-openembedded
1
0
Fork 0
mirror of git://git.openembedded.org/meta-openembedded synced 2026-05-18 16:50:45 +00:00
Code Issues Packages Projects Releases Wiki Activity

mariadb: replace dependency readline with libedit

Browse Source 
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>
This commit is contained in:
Kai Kang 2019-11-20 16:36:38 +08:00 committed by Khem Raj
parent 95bddd89fe
commit b69e4d8b2e
2 changed files with 1 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
meta-oe/recipes-dbs/mysql/mariadb.inc
View File

@ -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"

2
meta-oe/recipes-dbs/mysql/mariadb_10.3.18.bb
View File

@ -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"