From 86de202b7ed3a250c051736ee9676f6ba413d110 Mon Sep 17 00:00:00 2001 From: Koen Kooi Date: Wed, 30 Apr 2014 07:22:20 +0200 Subject: openldap: inherit autotools-brokensep Also remove hack that deletes headers from staging, it's not needed anymore. Signed-off-by: Koen Kooi Signed-off-by: Martin Jansa --- meta-oe/recipes-support/openldap/openldap_2.4.23.bb | 16 +--------------- 1 file changed, 1 insertion(+), 15 deletions(-) (limited to 'meta-oe') 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 434029c21b..5c6f9eac65 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 -- cgit 1.2.3-korg