summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--meta-networking/recipes-daemons/cyrus-sasl/cyrus-sasl/0001-Allow-saslauthd-to-be-built-outside-of-source-tree-w.patch41
-rw-r--r--meta-networking/recipes-daemons/cyrus-sasl/cyrus-sasl_2.1.27.bb1
2 files changed, 42 insertions, 0 deletions
diff --git a/meta-networking/recipes-daemons/cyrus-sasl/cyrus-sasl/0001-Allow-saslauthd-to-be-built-outside-of-source-tree-w.patch b/meta-networking/recipes-daemons/cyrus-sasl/cyrus-sasl/0001-Allow-saslauthd-to-be-built-outside-of-source-tree-w.patch
new file mode 100644
index 000000000..c89822c36
--- /dev/null
+++ b/meta-networking/recipes-daemons/cyrus-sasl/cyrus-sasl/0001-Allow-saslauthd-to-be-built-outside-of-source-tree-w.patch
@@ -0,0 +1,41 @@
1From 6515f3e7656d97d40a6a1cf4eb3ada193a698309 Mon Sep 17 00:00:00 2001
2From: Hongxu Jia <hongxu.jia@windriver.com>
3Date: Wed, 12 Sep 2018 23:18:12 +0800
4Subject: [PATCH] Allow saslauthd to be built outside of source tree while
5 configuring with `--enable-ldapdb'
6
7[snip]
8| powerpc-wrs-linux-gcc [snip] -I../common
9|../../git/saslauthd/lak.c:58:10: fatal error: crypto-compat.h:
10No such file or directory
11[snip]
12
13The crypto-compat.h locates in git/common/, it should be |
14`-I../../git/common'
15
16Remove useless `-I$(top_srcdir)/../include' which was incorrectly
17added by commit `faae590 cleanup misc INCLUDES for different build paths'
18
19Upstream-Status: Submitted [https://github.com/cyrusimap/cyrus-sasl]
20
21Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com>
22---
23 saslauthd/Makefile.am | 2 +-
24 1 file changed, 1 insertion(+), 1 deletion(-)
25
26diff --git a/saslauthd/Makefile.am b/saslauthd/Makefile.am
27index d7244be..864b29b 100644
28--- a/saslauthd/Makefile.am
29+++ b/saslauthd/Makefile.am
30@@ -34,7 +34,7 @@ saslcache_SOURCES = saslcache.c
31
32 EXTRA_DIST = saslauthd.8 saslauthd.mdoc include \
33 getnameinfo.c getaddrinfo.c LDAP_SASLAUTHD
34-AM_CPPFLAGS = -I$(top_srcdir)/include -I$(top_builddir)/include -I$(top_srcdir)/../include -I$(top_builddir)/common
35+AM_CPPFLAGS = -I$(top_srcdir)/include -I$(top_builddir)/include -I$(top_builddir)/common -I$(top_srcdir)/common
36 DEFS = @DEFS@ -DSASLAUTHD_CONF_FILE_DEFAULT=\"@sysconfdir@/saslauthd.conf\" -I. -I$(srcdir) -I..
37
38
39--
402.7.4
41
diff --git a/meta-networking/recipes-daemons/cyrus-sasl/cyrus-sasl_2.1.27.bb b/meta-networking/recipes-daemons/cyrus-sasl/cyrus-sasl_2.1.27.bb
index a03712c55..573f8224d 100644
--- a/meta-networking/recipes-daemons/cyrus-sasl/cyrus-sasl_2.1.27.bb
+++ b/meta-networking/recipes-daemons/cyrus-sasl/cyrus-sasl_2.1.27.bb
@@ -14,6 +14,7 @@ SRC_URI = "git://github.com/cyrusimap/cyrus-sasl;protocol=https \
14 file://saslauthd.service \ 14 file://saslauthd.service \
15 file://saslauthd.conf \ 15 file://saslauthd.conf \
16 file://0004-configure.ac-fix-condition-for-suppliment-snprintf-i.patch \ 16 file://0004-configure.ac-fix-condition-for-suppliment-snprintf-i.patch \
17 file://0001-Allow-saslauthd-to-be-built-outside-of-source-tree-w.patch \
17 " 18 "
18 19
19UPSTREAM_CHECK_URI = "https://github.com/cyrusimap/cyrus-sasl/archives" 20UPSTREAM_CHECK_URI = "https://github.com/cyrusimap/cyrus-sasl/archives"