aboutsummaryrefslogtreecommitdiff
path: root/meta-linaro/recipes-support
diff options
context:
space:
mode:
authorMarcin Juszkiewicz <marcin.juszkiewicz@linaro.org>2013-04-19 12:19:15 +0200
committerMarcin Juszkiewicz <marcin.juszkiewicz@linaro.org>2013-04-19 12:19:15 +0200
commit9c29e2002a5eaa87d8f87df35b0a8adcdc0a33ee (patch)
tree3b8126736927ef72d3e7665c615f8b834aa2fd25 /meta-linaro/recipes-support
parent0bb34fcef9194da7bd066a2086b1642e372d19cc (diff)
downloadmeta-linaro-9c29e2002a5eaa87d8f87df35b0a8adcdc0a33ee.tar.gz
openldap: do not link with ICU
Signed-off-by: Marcin Juszkiewicz <marcin.juszkiewicz@linaro.org>
Diffstat (limited to 'meta-linaro/recipes-support')
-rw-r--r--meta-linaro/recipes-support/openldap/openldap-2.4.23/kill-icu.patch30
-rw-r--r--meta-linaro/recipes-support/openldap/openldap_2.4.23.bbappend4
2 files changed, 34 insertions, 0 deletions
diff --git a/meta-linaro/recipes-support/openldap/openldap-2.4.23/kill-icu.patch b/meta-linaro/recipes-support/openldap/openldap-2.4.23/kill-icu.patch
new file mode 100644
index 00000000..dcf54113
--- /dev/null
+++ b/meta-linaro/recipes-support/openldap/openldap-2.4.23/kill-icu.patch
@@ -0,0 +1,30 @@
+From: Marcin Juszkiewicz <marcin.juszkiewicz@linaro.org>
+
+slapd depends on ICU if it was built first.
+
+Upstream-status: inappropiate [embedded specific]
+---
+ configure.in | 8 --------
+ 1 file changed, 8 deletions(-)
+
+--- openldap-2.4.23.orig/configure.in
++++ openldap-2.4.23/configure.in
+@@ -2045,18 +2045,10 @@ if test $ol_enable_ndb != no ; then
+ SLAPD_LIBS="$SLAPD_LIBS \$(SLAPD_NDB_LIBS)"
+ fi
+ fi
+
+ dnl ----------------------------------------------------------------
+-dnl International Components for Unicode
+-OL_ICU
+-if test "$ol_icu" = no ; then
+- AC_MSG_WARN([ICU not available])
+-else
+- ICU_LIBS="$ol_icu"
+-fi
+-dnl ----------------------------------------------------------------
+ dnl
+ dnl Check for Cyrus SASL
+ dnl
+ WITH_SASL=no
+ ol_link_sasl=no
diff --git a/meta-linaro/recipes-support/openldap/openldap_2.4.23.bbappend b/meta-linaro/recipes-support/openldap/openldap_2.4.23.bbappend
new file mode 100644
index 00000000..dba97dce
--- /dev/null
+++ b/meta-linaro/recipes-support/openldap/openldap_2.4.23.bbappend
@@ -0,0 +1,4 @@
+FILESEXTRAPATHS_prepend := "${THISDIR}/openldap-2.4.23/:"
+
+SRC_URI_append = " \
+ file://kill-icu.patch"