[oe] [PATCH] autotools.bbclass fix issue with native
Denis 'Gnutoo' Carikli
GNUtoo at no-log.org
Fri Feb 12 19:28:36 UTC 2010
STAGING_DIR_HOST is "" when using native bbclass:
native.bbclass:STAGING_DIR_HOST = ""
But in autotools.bbclass there is:
sed -i -e s:${STAGING_DIR_HOST}::g $i
which result in the following code in run.autotools_prepackage_lamangler
sed -i -e s:::g $i
which makes libxml2-native fail like this:
| sed: -e expression #1, char 0: no previous regular expression
I discussed it on IRC:
Feb 11 17:41:29 <RP> GNUtoo: We should only be doing that is STAGING_DIR_HOST isn't empty I guess
So I made a temporary fix which only workarround,because some issues persist:
Feb 11 17:41:02 <pb_> RP: heh, I wonder whether paths with colons in would be considered valid :-}
Signed-off-by: Denis 'Gnutoo' Carikli <GNUtoo at no-log.org>
---
classes/autotools.bbclass | 5 ++++-
1 files changed, 4 insertions(+), 1 deletions(-)
diff --git a/classes/autotools.bbclass b/classes/autotools.bbclass
index 1ea4b6f..daa0deb 100644
--- a/classes/autotools.bbclass
+++ b/classes/autotools.bbclass
@@ -152,7 +152,10 @@ autotools_prepackage_lamangler () {
sed -i -e s:${CROSS_DIR}/${HOST_SYS}::g $i
sed -i -e s:${CROSS_DIR}::g $i
sed -i -e s:${STAGING_LIBDIR}:${libdir}:g $i
- sed -i -e s:${STAGING_DIR_HOST}::g $i
+ #TODO: needs better handling of native
+ if [ -n "${STAGING_DIR_HOST}" ]; then
+ sed -i -e s:${STAGING_DIR_HOST}::g $i
+ fi
sed -i -e s:${STAGING_DIR}::g $i
sed -i -e s:${S}::g $i
sed -i -e s:${T}::g $i
--
1.6.4.4
More information about the Openembedded-devel
mailing list