diff options
| author |   Martin Jansa <Martin.Jansa@gmail.com> | 2013-07-21 15:10:28 +0200 |
|---|---|---|
| committer |   Paul Eggleton <paul.eggleton@linux.intel.com> | 2013-08-16 10:39:47 +0100 |
| commit | 85d1c85af0422b3dbfce5630e2901607684d4930 (patch) | |
| tree | 68d26b65e6f485fb644f01fefed66d3d30a4bf0f | |
| parent | 5ab491ffcee1b3ae1d7970918c61f9b91ccb9d7e (diff) | |
| download | openembedded-core-85d1c85af0422b3dbfce5630e2901607684d4930.tar.gz | |
mailx: remove support for autodetection of krb5
* it's autodetected from sysroot and makeconfig doesn't allow
to explicitly define what's expected
(From OE-Core master rev: 203d5e1deb53e1c968498ff7595f57c73dc2697a)
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
Signed-off-by: Saul Wold <sgw@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
| -rw-r--r-- | meta/recipes-extended/mailx/mailx-12.5/explicitly.disable.krb5.support.patch | 46 | ||||
| -rw-r--r-- | meta/recipes-extended/mailx/mailx_12.5.bb | 1 |
2 files changed, 47 insertions, 0 deletions
diff --git a/meta/recipes-extended/mailx/mailx-12.5/explicitly.disable.krb5.support.patch b/meta/recipes-extended/mailx/mailx-12.5/explicitly.disable.krb5.support.patch new file mode 100644 index 0000000000..8c7178bf8c --- /dev/null +++ b/meta/recipes-extended/mailx/mailx-12.5/explicitly.disable.krb5.support.patch @@ -0,0 +1,46 @@ +krb5 support is autodetected from sysroot making builds undeterministic +feel free to improve this to support explicitly enabling/disabling it + +Upstream-Status: Penging + +Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com> + +--- a/makeconfig 2013-07-21 15:06:11.177792334 +0200 ++++ b/makeconfig 2013-07-21 15:07:20.028793994 +0200 +@@ -424,36 +424,6 @@ + } + ! + +-<$tmp2.c link_check gssapi 'for GSSAPI in libgss' \ +- '#define USE_GSSAPI' '-lgss' || +- <$tmp2.c link_check gssapi 'for GSSAPI in libgssapi_krb5' \ +- '#define USE_GSSAPI' '-lgssapi_krb5' || +- link_check gssapi 'for GSSAPI in libgssapi_krb5, old-style' \ +- '#define USE_GSSAPI +-#define GSSAPI_OLD_STYLE' '-lgssapi_krb5' <<\! || \ +- link_check gssapi 'for GSSAPI in libgssapi' \ +- '#define USE_GSSAPI +-#define GSSAPI_REG_INCLUDE' '-lgssapi' <<\% +-#include <gssapi/gssapi.h> +-#include <gssapi/gssapi_generic.h> +- +-int main(void) +-{ +- gss_import_name(0, 0, gss_nt_service_name, 0); +- gss_init_sec_context(0,0,0,0,0,0,0,0,0,0,0,0,0); +- return 0; +-} +-! +-#include <gssapi.h> +- +-int main(void) +-{ +- gss_import_name(0, 0, GSS_C_NT_HOSTBASED_SERVICE, 0); +- gss_init_sec_context(0,0,0,0,0,0,0,0,0,0,0,0,0); +- return 0; +-} +-% +- + cat >$tmp2.c <<\! + #include "config.h" + #ifdef HAVE_NL_LANGINFO diff --git a/meta/recipes-extended/mailx/mailx_12.5.bb b/meta/recipes-extended/mailx/mailx_12.5.bb index 2a08113bd2..f6734c7ee7 100644 --- a/meta/recipes-extended/mailx/mailx_12.5.bb +++ b/meta/recipes-extended/mailx/mailx_12.5.bb @@ -14,6 +14,7 @@ DEPENDS = "openssl" SRC_URI = "${DEBIAN_MIRROR}/main/h/heirloom-mailx/heirloom-mailx_${PV}.orig.tar.gz;name=archive \ ${DEBIAN_MIRROR}/main/h/heirloom-mailx/heirloom-mailx_${PV}-1.diff.gz;name=patch \ + file://explicitly.disable.krb5.support.patch \ " SRC_URI[archive.md5sum] = "29a6033ef1412824d02eb9d9213cb1f2" |