classes/binconfig.bbclass: Allow packages to add sed expressions

packages/apr/apr-util,apr: patch the config files to be 'installed' and not point to the build and source-directory.

diff --git a/classes/binconfig.bbclass b/classes/binconfig.bbclass
index 4e425a76d61d6df113eb5439fd560be78bf927e8..5ce9ff6f0d4829f757649110c3fb17fa64b597d2 100644 (file)
--- a/classes/binconfig.bbclass
+++ b/classes/binconfig.bbclass
@@ -20,6 +20,8 @@ def get_binconfig_mangle(d):
                s += " -e 's:OEEXECPREFIX:${STAGING_DIR_HOST}${layout_exec_prefix}:'"
                s += " -e 's:-I${WORKDIR}:-I${STAGING_INCDIR}:'"
                s += " -e 's:-L${WORKDIR}:-L${STAGING_LIBDIR}:'"
+               if bb.data.getVar("OE_BINCONFIG_EXTRA_MANGLE", d):
+                   s += bb.data.getVar("OE_BINCONFIG_EXTRA_MANGLE", d)
        return s
 
 BINCONFIG_GLOB ?= "*-config"

diff --git a/packages/apr/apr-util_1.2.7.bb b/packages/apr/apr-util_1.2.7.bb
index ea816079532779d345b56fbe4e08287e20224fda..15437141335b4901744f9f1b001a4c63020581b6 100644 (file)
--- a/packages/apr/apr-util_1.2.7.bb
+++ b/packages/apr/apr-util_1.2.7.bb
@@ -14,8 +14,11 @@ EXTRA_OECONF = "--with-apr=${STAGING_BINDIR_CROSS} --with-dbm=gdbm \
                --without-sqlite3 \
                --with-expat=${STAGING_DIR_HOST}${layout_prefix}"
 
+
 inherit autotools lib_package binconfig
 
+OE_BINCONFIG_EXTRA_MANGLE = " -e 's:location=source:location=installed:'"
+
 do_configure() {
   oe_runconf
 }

diff --git a/packages/apr/apr_1.2.7.bb b/packages/apr/apr_1.2.7.bb
index 2016ca01265705445faee7e13777897ea1e403b8..d11c1f565ee3680d7e6a3e0339e09f2bf66e728d 100644 (file)
--- a/packages/apr/apr_1.2.7.bb
+++ b/packages/apr/apr_1.2.7.bb
@@ -9,6 +9,8 @@ SRC_URI = "${APACHE_MIRROR}/apr/${P}.tar.bz2"
 
 inherit autotools lib_package binconfig
 
+OE_BINCONFIG_EXTRA_MANGLE = " -e 's:location=source:location=installed:'"
+
 do_configure() {
   oe_runconf
 }