summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorHolger Freyther <zecke@selfish.org>2007-12-27 11:46:52 +0000
committerHolger Freyther <zecke@selfish.org>2007-12-27 11:46:52 +0000
commit030992bdd415c8892cf2925cf6fbe888226be046 (patch)
tree8ffc30bf1b6e7a3366a8c5bcafb139535fac1a2d
parent83ada4a02f5c6ad9eb4af7e947fd113204adb2ce (diff)
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.
-rw-r--r--classes/binconfig.bbclass2
-rw-r--r--packages/apr/apr-util_1.2.7.bb3
-rw-r--r--packages/apr/apr_1.2.7.bb2
3 files changed, 7 insertions, 0 deletions
diff --git a/classes/binconfig.bbclass b/classes/binconfig.bbclass
index 4e425a76d6..5ce9ff6f0d 100644
--- 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 ea81607953..1543714133 100644
--- 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 2016ca0126..d11c1f565e 100644
--- 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
}