aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMarcin Juszkiewicz <marcin.juszkiewicz@linaro.org>2013-04-22 21:13:15 +0200
committerMarcin Juszkiewicz <marcin.juszkiewicz@linaro.org>2013-04-22 21:13:15 +0200
commitd3f266b8bd5ede7d31880616343480d10c55b4ff (patch)
tree0e899b6569306165c9f6d7dddc8cbaa3d3a8aed1
parent5a78ed25467d6726f4a1977eb66ab680ede0fc1f (diff)
downloadmeta-linaro-d3f266b8bd5ede7d31880616343480d10c55b4ff.tar.gz
openldap: merged into OE
Signed-off-by: Marcin Juszkiewicz <marcin.juszkiewicz@linaro.org>
-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, 0 insertions, 34 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
deleted file mode 100644
index dcf54113..00000000
--- a/meta-linaro/recipes-support/openldap/openldap-2.4.23/kill-icu.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-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
deleted file mode 100644
index dba97dce..00000000
--- a/meta-linaro/recipes-support/openldap/openldap_2.4.23.bbappend
+++ /dev/null
@@ -1,4 +0,0 @@
-FILESEXTRAPATHS_prepend := "${THISDIR}/openldap-2.4.23/:"
-
-SRC_URI_append = " \
- file://kill-icu.patch"