diff options
| author | Denis 'Gnutoo' Carikli <GNUtoo@no-log.org> | 2010-02-12 13:51:26 +0100 |
|---|---|---|
| committer | Denis 'Gnutoo' Carikli <GNUtoo@no-log.org> | 2010-02-13 02:05:09 +0100 |
| commit | 92b4e2562f70af5db556390431477c73e68a7857 (patch) | |
| tree | de0099601eff583465aa01389cab793133b25cd9 | |
| parent | 0af03b94cd8575da9c6722caa54e8fb36895844d (diff) | |
autotools.bbclass: fix issue with native and sed
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@no-log.org>
| -rw-r--r-- | classes/autotools.bbclass | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/classes/autotools.bbclass b/classes/autotools.bbclass index 1ea4b6f1d0..c53583b8b6 100644 --- a/classes/autotools.bbclass +++ b/classes/autotools.bbclass @@ -152,7 +152,9 @@ 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 + 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 |