[oe-commits] org.oe.dev applied changes from df475b842adf853bad8285bda460dd5b55117eb2

[freyther commit]

applied changes from df475b842adf853bad8285bda460dd5b55117eb2
             through 58fc861e7d3a6d55876c4974fd3778a4d7452c03

Revision: 58fc861e7d3a6d55876c4974fd3778a4d7452c03
Ancestor: df475b842adf853bad8285bda460dd5b55117eb2
Author: freyther at openembedded.org
Date: 2007-12-27T11:46:52
Branch: org.openembedded.dev

Modified files:
        classes/binconfig.bbclass packages/apr/apr-util_1.2.7.bb
	        packages/apr/apr_1.2.7.bb

		ChangeLog:

		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.

Author: freyther
Branch: org.openembedded.dev
Revision: 0666c77d90ff355268592d6c7ecd3d7bc0cb1149
ViewMTN: http://monotone.openembedded.org/revision/info/0666c77d90ff355268592d6c7ecd3d7bc0cb1149
Files:
1
classes/binconfig.bbclass
packages/apr/apr-util_1.2.7.bb
packages/apr/apr_1.2.7.bb
Diffs:

#
# mt diff -r2e46e4c6921d78344513b22fc90ae657f6c1a3cb -r0666c77d90ff355268592d6c7ecd3d7bc0cb1149
#
# 
# 
# patch "classes/binconfig.bbclass"
#  from [660275cce8f7fec339f68e7aa419d334663a5a21]
#    to [58dc018aedba1b26f08340968881e9b10ad2c6a0]
# 
# patch "packages/apr/apr-util_1.2.7.bb"
#  from [5bea7d4ba65baaae2f314e0e4725e74384c7d8c6]
#    to [c8977ce2f32ecb1ab433c6868344ebe8b779830c]
# 
# patch "packages/apr/apr_1.2.7.bb"
#  from [9816898cd2e93fcd6a95f7506682ab0955872666]
#    to [25daa42d200e1329105d6b414ab4f05ac30b783f]
# 
============================================================
--- classes/binconfig.bbclass	660275cce8f7fec339f68e7aa419d334663a5a21
+++ classes/binconfig.bbclass	58dc018aedba1b26f08340968881e9b10ad2c6a0
@@ -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"
============================================================
--- packages/apr/apr-util_1.2.7.bb	5bea7d4ba65baaae2f314e0e4725e74384c7d8c6
+++ packages/apr/apr-util_1.2.7.bb	c8977ce2f32ecb1ab433c6868344ebe8b779830c
@@ -14,8 +14,11 @@ EXTRA_OECONF = "--with-apr=${STAGING_BIN
 		--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
 }
============================================================
--- packages/apr/apr_1.2.7.bb	9816898cd2e93fcd6a95f7506682ab0955872666
+++ packages/apr/apr_1.2.7.bb	25daa42d200e1329105d6b414ab4f05ac30b783f
@@ -9,6 +9,8 @@ inherit autotools lib_package binconfig
 
 inherit autotools lib_package binconfig
 
+OE_BINCONFIG_EXTRA_MANGLE = " -e 's:location=source:location=installed:'"
+
 do_configure() {
   oe_runconf
 }