aboutsummaryrefslogtreecommitdiffstats
path: root/meta-oe
diff options
context:
space:
mode:
authorKoen Kooi <koen.kooi@linaro.org>2014-04-30 07:22:20 +0200
committerMartin Jansa <Martin.Jansa@gmail.com>2014-05-03 20:47:03 +0200
commit86de202b7ed3a250c051736ee9676f6ba413d110 (patch)
tree59af6de8781b2103641c84afc9155262740a8c1e /meta-oe
parent806ba2885ba7444ef940a086e96f8e5c564b65bd (diff)
downloadmeta-openembedded-86de202b7ed3a250c051736ee9676f6ba413d110.tar.gz
meta-openembedded-86de202b7ed3a250c051736ee9676f6ba413d110.tar.bz2
meta-openembedded-86de202b7ed3a250c051736ee9676f6ba413d110.zip
openldap: inherit autotools-brokensep
Also remove hack that deletes headers from staging, it's not needed anymore. Signed-off-by: Koen Kooi <koen.kooi@linaro.org> Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
Diffstat (limited to 'meta-oe')
-rw-r--r--meta-oe/recipes-support/openldap/openldap_2.4.23.bb16
1 files changed, 1 insertions, 15 deletions
diff --git a/meta-oe/recipes-support/openldap/openldap_2.4.23.bb b/meta-oe/recipes-support/openldap/openldap_2.4.23.bb
index 434029c21..5c6f9eac6 100644
--- a/meta-oe/recipes-support/openldap/openldap_2.4.23.bb
+++ b/meta-oe/recipes-support/openldap/openldap_2.4.23.bb
@@ -29,7 +29,7 @@ PR = "r1"
# environments
SRC_URI += "file://install-strip.patch"
-inherit autotools
+inherit autotools-brokensep
# CV SETTINGS
# Required to work round AC_FUNC_MEMCMP which gets the wrong answer
@@ -151,20 +151,6 @@ do_configure() {
oe_runconf
}
-#FIXME: this is a hack, at present an openldap build will pick up the header
-# files from staging rather than the local ones (bad -I order), so remove
-# the headers (from openldap-old.x) before compiling...
-do_compile_prepend() {
- (
- cd ${STAGING_INCDIR}
- rm -f ldap.h ldap_*.h
- )
- (
- cd ${STAGING_LIBDIR}
- rm -f libldap* liblber*
- )
-}
-
LEAD_SONAME = "libldap-${LDAP_VER}.so.*"
# The executables go in a separate package. This allows the