diff options
author | Roy Li <rongqing.li@windriver.com> | 2015-06-12 08:59:25 +0800 |
---|---|---|
committer | Martin Jansa <Martin.Jansa@gmail.com> | 2015-06-17 22:36:12 +0200 |
commit | c099952f144e1303cd59455635c257ee8c9c8293 (patch) | |
tree | afe78747bf6b3d2013d3c0f379010e6f0a52eb6e /meta-oe/recipes-support/mysql/mariadb.inc | |
parent | 41fe0f663ecbf4a739d93b7b62e053336ea64709 (diff) | |
download | meta-openembedded-c099952f144e1303cd59455635c257ee8c9c8293.tar.gz |
mariadb: fix floating dependency on krb5
Mariadb depends on openssl, openssl conditionally depends on krb5 by
checking if OPENSSL_NO_KRB5 is defined, but cmake can not handle "ifndef"
and always ask krb5.h if krb5.h exist when cmake make_depend;
Faking a kssl.h if krb5 is not in PACKAGECONF, which does not include
krb5 related declaration, install the faked kssl.h into build dir to
be searched firstly
Signed-off-by: Roy Li <rongqing.li@windriver.com>
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
Diffstat (limited to 'meta-oe/recipes-support/mysql/mariadb.inc')
-rw-r--r-- | meta-oe/recipes-support/mysql/mariadb.inc | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/meta-oe/recipes-support/mysql/mariadb.inc b/meta-oe/recipes-support/mysql/mariadb.inc index e7e280522..955402a58 100644 --- a/meta-oe/recipes-support/mysql/mariadb.inc +++ b/meta-oe/recipes-support/mysql/mariadb.inc | |||
@@ -43,6 +43,7 @@ PACKAGECONFIG_class-native = "" | |||
43 | PACKAGECONFIG[pam] = ",-DWITHOUT_AUTH_PAM=TRUE,libpam" | 43 | PACKAGECONFIG[pam] = ",-DWITHOUT_AUTH_PAM=TRUE,libpam" |
44 | PACKAGECONFIG[valgrind] = "-DWITH_VALGRIND=TRUE,-DWITHOUT_VALGRIND=TRUE,valgrind" | 44 | PACKAGECONFIG[valgrind] = "-DWITH_VALGRIND=TRUE,-DWITHOUT_VALGRIND=TRUE,valgrind" |
45 | PACKAGECONFIG[libedit] = "-DLIBEDIT_INTERFACE=TRUE,-DLIBEDIT_INTERFACE=FALSE,libedit" | 45 | PACKAGECONFIG[libedit] = "-DLIBEDIT_INTERFACE=TRUE,-DLIBEDIT_INTERFACE=FALSE,libedit" |
46 | PACKAGECONFIG[krb5] = ", ,krb5" | ||
46 | 47 | ||
47 | # MariaDB doesn't link properly with gold | 48 | # MariaDB doesn't link properly with gold |
48 | # https://mariadb.atlassian.net/browse/MDEV-5982 | 49 | # https://mariadb.atlassian.net/browse/MDEV-5982 |
@@ -85,6 +86,14 @@ do_compile_prepend_class-target () { | |||
85 | # and since we're cross-compiling that is disabled | 86 | # and since we're cross-compiling that is disabled |
86 | cp ${STAGING_BINDIR_NATIVE}/comp_err ${S}/extra | 87 | cp ${STAGING_BINDIR_NATIVE}/comp_err ${S}/extra |
87 | cp ${STAGING_BINDIR_NATIVE}/comp_sql ${S}/scripts | 88 | cp ${STAGING_BINDIR_NATIVE}/comp_sql ${S}/scripts |
89 | |||
90 | if [ "${@bb.utils.contains('PACKAGECONFIG', 'krb5', 'yes', 'no', d)}" = "no" ]; then | ||
91 | mkdir ${B}/include/openssl | ||
92 | echo "#ifndef KSSL_H" >${B}/include/openssl/kssl.h | ||
93 | echo "#define KSSL_H" >>${B}/include/openssl/kssl.h | ||
94 | echo "#include <openssl/opensslconf.h>">>${B}/include/openssl/kssl.h | ||
95 | echo "#endif" >>${B}/include/openssl/kssl.h | ||
96 | fi | ||
88 | } | 97 | } |
89 | 98 | ||
90 | SYSROOT_PREPROCESS_FUNCS += "mariadb_sysroot_preprocess" | 99 | SYSROOT_PREPROCESS_FUNCS += "mariadb_sysroot_preprocess" |