diff options
| author |   Joe MacDonald <joe.macdonald@windriver.com> | 2013-07-31 10:40:24 -0400 |
|---|---|---|
| committer | Joe MacDonald <joe.macdonald@windriver.com> | 2013-08-01 11:19:24 -0400 |
| commit | 4a192445658cb109a4c4002db2dfd997987e2083 (patch) | |
| tree | f837de9b2ee6ba28224d1d9b06548e4ca1e3fd2e /meta-networking/recipes-daemons/cyrus-sasl/cyrus-sasl | |
| parent | 24a2c46d775b956ffdfc949834af6b43e67028c4 (diff) | |
| download | meta-openembedded-contrib-4a192445658cb109a4c4002db2dfd997987e2083.tar.gz | |
cyrus-sasl: relocate files to package name dir
A minor bit of reorganization of the cyrus-sasl recipe directory in
preparation for a build fix.
Signed-off-by: Joe MacDonald <joe.macdonald@windriver.com>
Diffstat (limited to 'meta-networking/recipes-daemons/cyrus-sasl/cyrus-sasl')
| -rw-r--r-- | meta-networking/recipes-daemons/cyrus-sasl/cyrus-sasl/Fix-hardcoded-libdir.patch | 25 | ||||
| -rw-r--r-- | meta-networking/recipes-daemons/cyrus-sasl/cyrus-sasl/avoid-to-call-AC_TRY_RUN.patch | 46 |
2 files changed, 71 insertions, 0 deletions
diff --git a/meta-networking/recipes-daemons/cyrus-sasl/cyrus-sasl/Fix-hardcoded-libdir.patch b/meta-networking/recipes-daemons/cyrus-sasl/cyrus-sasl/Fix-hardcoded-libdir.patch new file mode 100644 index 0000000000..3fa8431c34 --- /dev/null +++ b/meta-networking/recipes-daemons/cyrus-sasl/cyrus-sasl/Fix-hardcoded-libdir.patch @@ -0,0 +1,25 @@ +Fix hardcoded libdir. + +Upstream-Status: Pending + +Signed-off-by: Roy.Li <rongqing.li@windriver.com> +--- + plugins/Makefile.am | 2 +- + 1 files changed, 1 insertions(+), 1 deletions(-) + +diff --git a/plugins/Makefile.am b/plugins/Makefile.am +index b00915f..25262a1 100644 +--- a/plugins/Makefile.am ++++ b/plugins/Makefile.am +@@ -62,7 +62,7 @@ plugindir = @plugindir@ + + common_sources = plugin_common.c plugin_common.h + +-sasldir = $(prefix)/lib/sasl2 ++sasldir = $(libdir)/sasl2 + sasl_LTLIBRARIES = @SASL_MECHS@ + EXTRA_LTLIBRARIES = libplain.la libanonymous.la libkerberos4.la libcrammd5.la \ + libgs2.la libgssapiv2.la libdigestmd5.la liblogin.la libsrp.la libotp.la \ +-- +1.7.4.1 + diff --git a/meta-networking/recipes-daemons/cyrus-sasl/cyrus-sasl/avoid-to-call-AC_TRY_RUN.patch b/meta-networking/recipes-daemons/cyrus-sasl/cyrus-sasl/avoid-to-call-AC_TRY_RUN.patch new file mode 100644 index 0000000000..6407721ae3 --- /dev/null +++ b/meta-networking/recipes-daemons/cyrus-sasl/cyrus-sasl/avoid-to-call-AC_TRY_RUN.patch @@ -0,0 +1,46 @@ +Avoid to call AC_TRY_RUN + +Upstream-Status: Inappropriate [configuration] + +Avoid to call AC_TRY_RUN to check if GSSAPI libraries support SPNEGO +on cross-compile environment by definition AC_ARG_ENABLE enable-spnego + +Signed-off-by: Roy.Li <rongqing.li@windriver.com> +--- + cmulocal/sasl2.m4 | 13 ++++++++++++- + 1 file changed, 12 insertions(+), 1 deletion(-) + +diff --git a/cmulocal/sasl2.m4 b/cmulocal/sasl2.m4 +index 3c2841a..a5ecf81 100644 +--- a/cmulocal/sasl2.m4 ++++ b/cmulocal/sasl2.m4 +@@ -281,6 +281,17 @@ if test "$gssapi" != no; then + + cmu_save_LIBS="$LIBS" + LIBS="$LIBS $GSSAPIBASE_LIBS" ++ AC_ARG_ENABLE([spnego], ++ [AC_HELP_STRING([--enable-spnego=<DIR>], ++ [enable SPNEGO support in GSSAPI libraries [no]])], ++ [spnego=$enableval], ++ [spnego=no]) ++ ++ if test "$spnego" = no; then ++ echo "no" ++ elif test "$spnego" = yes; then ++ AC_DEFINE(HAVE_GSS_SPNEGO,,[Define if your GSSAPI implementation supports SPNEGO]) ++ else + AC_MSG_CHECKING([for SPNEGO support in GSSAPI libraries]) + AC_TRY_RUN([ + #ifdef HAVE_GSSAPI_H +@@ -308,7 +319,7 @@ int main(void) + AC_MSG_RESULT(yes) ], + AC_MSG_RESULT(no)) + LIBS="$cmu_save_LIBS" +- ++ fi + else + AC_MSG_RESULT([disabled]) + fi +-- +1.7.10.4 + |