diff options
| author |   Martin Jansa <martin.jansa@gmail.com> | 2013-10-01 23:34:10 +0000 |
|---|---|---|
| committer |   Eric Bénard <eric@eukrea.com> | 2013-10-02 11:05:50 +0200 |
| commit | a108b2203a997634f87ac687e81712badaf3c546 (patch) | |
| tree | a7bb1e351da86cccfdcf8223551826e9f21a72fa | |
| parent | d0141728c5b5f61598964947690da54d2f91f10b (diff) | |
| download | meta-openembedded-contrib-a108b2203a997634f87ac687e81712badaf3c546.tar.gz | |
krb5: Add PACKAGECONFIG and new configure param to disable keyutils detection
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
Signed-off-by: Eric Bénard <eric@eukrea.com>
| -rw-r--r-- | meta-oe/recipes-connectivity/krb5/krb5/0001-aclocal-Add-parameter-to-disable-keyutils-detection.patch | 33 | ||||
| -rw-r--r-- | meta-oe/recipes-connectivity/krb5/krb5_1.11.bb | 3 |
2 files changed, 36 insertions, 0 deletions
diff --git a/meta-oe/recipes-connectivity/krb5/krb5/0001-aclocal-Add-parameter-to-disable-keyutils-detection.patch b/meta-oe/recipes-connectivity/krb5/krb5/0001-aclocal-Add-parameter-to-disable-keyutils-detection.patch new file mode 100644 index 0000000000..f0c310c5e8 --- /dev/null +++ b/meta-oe/recipes-connectivity/krb5/krb5/0001-aclocal-Add-parameter-to-disable-keyutils-detection.patch @@ -0,0 +1,33 @@ +From ecb62f3467f493cc0d679323f05367eebbf0fb67 Mon Sep 17 00:00:00 2001 +From: Martin Jansa <Martin.Jansa@gmail.com> +Date: Tue, 1 Oct 2013 22:22:57 +0200 +Subject: [PATCH] aclocal: Add parameter to disable keyutils detection + +Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com> +--- + aclocal.m4 | 4 ++++ + 1 file changed, 4 insertions(+) + +diff --git a/aclocal.m4 b/aclocal.m4 +index 210c473..83b1f02 100644 +--- a/aclocal.m4 ++++ b/aclocal.m4 +@@ -1650,11 +1650,15 @@ fi + dnl + dnl If libkeyutils exists (on Linux) include it and use keyring ccache + AC_DEFUN(KRB5_AC_KEYRING_CCACHE,[ ++AC_ARG_ENABLE([keyutils], ++AC_HELP_STRING([--disable-keyutils],don't enable using keyutils for keyring ccache @<:@enabled@:>@), , enable_keyutils=yes) ++if test "$enable_keyutils" = yes; then + AC_CHECK_HEADERS([keyutils.h], + AC_CHECK_LIB(keyutils, add_key, + [dnl Pre-reqs were found + AC_DEFINE(USE_KEYRING_CCACHE, 1, [Define if the keyring ccache should be enabled]) + LIBS="-lkeyutils $LIBS" + ])) ++fi + ])dnl + dnl +-- +1.8.3.2 + diff --git a/meta-oe/recipes-connectivity/krb5/krb5_1.11.bb b/meta-oe/recipes-connectivity/krb5/krb5_1.11.bb index 63676fd2b6..00ad9f97ce 100644 --- a/meta-oe/recipes-connectivity/krb5/krb5_1.11.bb +++ b/meta-oe/recipes-connectivity/krb5/krb5_1.11.bb @@ -11,6 +11,7 @@ PR = "r2" SRC_URI = "http://web.mit.edu/kerberos/dist/${PN}/${PV}/${P}-signed.tar \ file://055d1ffa81d0730e92aa3f1ed5045cd805c74957.patch \ + file://0001-aclocal-Add-parameter-to-disable-keyutils-detection.patch \ " SRC_URI[md5sum] = "1a13c53899806c4da99a798a04d25545" SRC_URI[sha256sum] = "fe37fb93b398db98a1b23f814673ea2ae4b90138f85e1a4027ef639456a78651" @@ -20,6 +21,7 @@ S = "${WORKDIR}/${P}/src/" PACKAGECONFIG ??= "openssl" PACKAGECONFIG[libedit] = "--with-libedit,--without-libedit,libedit" PACKAGECONFIG[openssl] = "--with-pkinit-crypto-impl=openssl,,openssl" +PACKAGECONFIG[keyutils] = "--enable-keyutils,--disable-keyutils,keyutils" EXTRA_OECONF += " --without-tcl --with-system-et --disable-rpath" CACHED_CONFIGUREVARS += "krb5_cv_attr_constructor_destructor=yes ac_cv_func_regcomp=yes \ @@ -45,5 +47,6 @@ python do_unpack() { do_configure() { gnu-configize --force + autoreconf oe_runconf } |