[oe-commits] Denis 'Gnutoo' Carikli : autotools.bbclass: fix issue with native and sed

[git version control]

Module: openembedded.git
Branch: org.openembedded.dev
Commit: 92b4e2562f70af5db556390431477c73e68a7857
URL:    http://gitweb.openembedded.net/?p=openembedded.git&a=commit;h=92b4e2562f70af5db556390431477c73e68a7857

Author: Denis 'Gnutoo' Carikli <GNUtoo at no-log.org>
Date:   Fri Feb 12 13:51:26 2010 +0100

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 at no-log.org>

---

 classes/autotools.bbclass |    4 +++-
 1 files changed, 3 insertions(+), 1 deletions(-)

diff --git a/classes/autotools.bbclass b/classes/autotools.bbclass
index 1ea4b6f..c53583b 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