krb5: Backport patch to fix parallel build
PATCH 1/2 krb5: Backport patch to fix parallel build
Signed-off-by Martin Jansa <[email protected]>
--- .../055d1ffa81d0730e92aa3f1ed5045cd805c74957.patch | 49 ++++++++++++++++++++++ meta-oe/recipes-connectivity/krb5/krb5_1.11.bb | 4 +- 2 files changed, 52 insertions(+), 1 deletion(-) create mode 100644 meta-oe/recipes-connectivity/krb5/krb5/055d1ffa81d0730e92aa3f1ed5045cd805c74957.patch
meta-oe/recipes-connectivity/krb5/krb5/055d1ffa81d0730e92aa3f1ed5045cd805c74957.patch new file +49 -0
@@ -0,0 +1,49 @@ +From 055d1ffa81d0730e92aa3f1ed5045cd805c74957 Mon Sep 17 00:00:00 2001 +From: Nickolai Zeldovich <[email protected]> +Date: Sun, 3 Mar 2013 01:38:22 -0500 +Subject: [PATCH] Fix dependencies in tests/gssapi + +Use $(COMMON_DEPS) instead of $(COMMON_DEPLIBS) for dependencies; the +latter appears to be a typo. Fixes build when using "make -j". + +ticket: 7587 (new) +target_version: 1.11.2 +tags: pullup + +Upstream-Status: Backport +http://krbdev.mit.edu/rt/Ticket/Display.html?id=7587 + +--- + tests/gssapi/Makefile.in | 6 +++--- + 1 file changed, 3 insertions(+), 3 deletions(-) + +diff --git a/tests/gssapi/Makefile.in b/tests/gssapi/Makefile.in +index 5620234..6a5870b 100644 +--- a/tests/gssapi/Makefile.in ++++ b/tests/gssapi/Makefile.in +@@ -45,11 +45,11 @@ t_accname: t_accname.o $(COMMON_DEPS) + $(CC_LINK) -o $@ t_accname.o $(COMMON_LIBS) + t_ccselect: t_ccselect.o $(COMMON_DEPS) + $(CC_LINK) -o $@ t_ccselect.o $(COMMON_LIBS) +-t_credstore: t_credstore.o $(COMMON_DEPLIBS) ++t_credstore: t_credstore.o $(COMMON_DEPS) + $(CC_LINK) -o $@ t_credstore.o $(COMMON_LIBS) + t_export_cred: t_export_cred.o $(COMMON_DEPS) + $(CC_LINK) -o $@ t_export_cred.o $(COMMON_LIBS) +-t_export_name: t_export_name.o $(COMMON_DEPLIBS) ++t_export_name: t_export_name.o $(COMMON_DEPS) + $(CC_LINK) -o $@ t_export_name.o $(COMMON_LIBS) + t_gssexts: t_gssexts.o $(COMMON_DEPS) + $(CC_LINK) -o $@ t_gssexts.o $(COMMON_LIBS) +@@ -67,7 +67,7 @@ t_s4u: t_s4u.o $(COMMON_DEPS) + $(CC_LINK) -o $@ t_s4u.o $(COMMON_LIBS) + t_s4u2proxy_krb5: t_s4u2proxy_krb5.o $(COMMON_DEPS) + $(CC_LINK) -o $@ t_s4u2proxy_krb5.o $(COMMON_LIBS) +-t_saslname: t_saslname.o $(COMMON_DEPLIBS) ++t_saslname: t_saslname.o $(COMMON_DEPS) + $(CC_LINK) -o $@ t_saslname.o $(COMMON_LIBS) + t_spnego: t_spnego.o $(COMMON_DEPS) + $(CC_LINK) -o $@ t_spnego.o $(COMMON_LIBS) +-- +1.8.4 +
meta-oe/recipes-connectivity/krb5/krb5_1.11.bb +3 -1
@@ -9,7 +9,9 @@ inherit autotools binconfig perlnative PR = "r2" -SRC_URI = "http://web.mit.edu/kerberos/dist/${PN}/${PV}/${P}-signed.tar" +SRC_URI = "http://web.mit.edu/kerberos/dist/${PN}/${PV}/${P}-signed.tar \ + file://055d1ffa81d0730e92aa3f1ed5045cd805c74957.patch \ +" SRC_URI[md5sum] = "1a13c53899806c4da99a798a04d25545" SRC_URI[sha256sum] = "fe37fb93b398db98a1b23f814673ea2ae4b90138f85e1a4027ef639456a78651"
Signature · 1 line
1.8.3.2
PATCH 2/2 krb5: Add PACKAGECONFIG and new configure param to disable keyutils detection
Signed-off-by Martin Jansa <[email protected]>
--- ...d-parameter-to-disable-keyutils-detection.patch | 33 ++++++++++++++++++++++ meta-oe/recipes-connectivity/krb5/krb5_1.11.bb | 3 ++ 2 files changed, 36 insertions(+) create mode 100644 meta-oe/recipes-connectivity/krb5/krb5/0001-aclocal-Add-parameter-to-disable-keyutils-detection.patch
meta-oe/recipes-connectivity/krb5/krb5/0001-aclocal-Add-parameter-to-disable-keyutils-detection.patch new file +33 -0
@@ -0,0 +1,33 @@ +From ecb62f3467f493cc0d679323f05367eebbf0fb67 Mon Sep 17 00:00:00 2001 +From: Martin Jansa <[email protected]> +Date: Tue, 1 Oct 2013 22:22:57 +0200 +Subject: [PATCH] aclocal: Add parameter to disable keyutils detection + +Signed-off-by: Martin Jansa <[email protected]> +--- + 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 +
meta-oe/recipes-connectivity/krb5/krb5_1.11.bb +3 -0
@@ -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 }
Signature · 1 line
1.8.3.2
Re: [meta-oe][dylan][PATCH 2/2] krb5: Add PACKAGECONFIG and new configure param to disable keyutils detection
Hi Martin,
Quoted 5 lines · Martin Jansa
Signed-off-by Martin Jansa <[email protected]>--- ...d-parameter-to-disable-keyutils-detection.patch | 33 ++++++++++++++++++++++ meta-oe/recipes-connectivity/krb5/krb5_1.11.bb | 3 ++ 2 files changed, 36 insertions(+)
both pushed to dylan-next.
Thanks
Eric