From 92b4e2562f70af5db556390431477c73e68a7857 Mon Sep 17 00:00:00 2001 From: Denis 'Gnutoo' Carikli Date: Fri, 12 Feb 2010 13:51:26 +0100 Subject: 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 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 RP: heh, I wonder whether paths with colons in would be considered valid :-} Signed-off-by: Denis 'Gnutoo' Carikli --- classes/autotools.bbclass | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'classes/autotools.bbclass') 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 -- cgit v1.2.3 From a215c2f283476776567506c2e3f969c48f7e5e3d Mon Sep 17 00:00:00 2001 From: Chris Larson Date: Tue, 9 Mar 2010 16:54:57 -0700 Subject: Don't inherit siteinfo in base.bbclass Acked-by: Richard Purdie Acked-by: Marcin Juszkiewicz Signed-off-by: Chris Larson --- classes/autotools.bbclass | 6 ++++++ 1 file changed, 6 insertions(+) (limited to 'classes/autotools.bbclass') diff --git a/classes/autotools.bbclass b/classes/autotools.bbclass index c53583b8b6..31d357892a 100644 --- a/classes/autotools.bbclass +++ b/classes/autotools.bbclass @@ -28,6 +28,12 @@ DEPENDS_prepend = "${@autotools_dep_prepend(d)}" DEPENDS_virtclass-native_prepend = "${@autotools_dep_prepend(d)}" DEPENDS_virtclass-nativesdk_prepend = "${@autotools_dep_prepend(d)}" +inherit siteinfo + +# Space separated list of shell scripts with variables defined to supply test +# results for autoconf tests we cannot run at build time. +export CONFIG_SITE = "${@siteinfo_get_files(d)}" + acpaths = "default" EXTRA_AUTORECONF = "--exclude=autopoint" -- cgit v1.2.3