summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRoss Burton <ross.burton@intel.com>2015-07-14 15:50:05 +0100
committerRichard Purdie <richard.purdie@linuxfoundation.org>2015-07-16 15:08:45 +0100
commit7b064a9dc1dc8c30c7b9982e263a754a144c0a99 (patch)
tree4616cc404829d7971ea0389c1a1fc62d90ed965f
parent74b1757e080d14188fe9f77f6e07ed83b696a2c8 (diff)
downloadopenembedded-core-7b064a9dc1dc8c30c7b9982e263a754a144c0a99.tar.gz
openembedded-core-7b064a9dc1dc8c30c7b9982e263a754a144c0a99.tar.bz2
openembedded-core-7b064a9dc1dc8c30c7b9982e263a754a144c0a99.zip
guile: Add explicit directories to guile_cross_config
guile_cross_config() was using relative paths which mean it depends on exactly what directory it starts in. To clarify the code, always use absolute paths. Signed-off-by: Ross Burton <ross.burton@intel.com>
-rw-r--r--meta/recipes-devtools/guile/guile_2.0.11.bb10
1 files changed, 5 insertions, 5 deletions
diff --git a/meta/recipes-devtools/guile/guile_2.0.11.bb b/meta/recipes-devtools/guile/guile_2.0.11.bb
index d1578e08cf..621fa0f52b 100644
--- a/meta/recipes-devtools/guile/guile_2.0.11.bb
+++ b/meta/recipes-devtools/guile/guile_2.0.11.bb
@@ -81,16 +81,16 @@ guile_cross_config() {
# Create guile-config returning target values instead of native values
install -d ${SYSROOT_DESTDIR}${STAGING_BINDIR_CROSS}
echo '#!'`which ${BUILD_SYS}-guile`$' \\\n--no-auto-compile -e main -s\n!#\n(define %guile-build-info '\'\( \
- > guile-config.cross
+ > ${B}/guile-config.cross
sed -n -e 's:^[ \t]*{[ \t]*": (:' \
-e 's:",[ \t]*": . ":' \
-e 's:" *}, *\\:"):' \
-e 's:^.*cachedir.*$::' \
-e '/^ (/p' \
- < libguile/libpath.h >> guile-config.cross
- echo '))' >> guile-config.cross
- cat meta/guile-config >> guile-config.cross
- install guile-config.cross ${STAGING_BINDIR_CROSS}/guile-config
+ < ${B}/libguile/libpath.h >> ${B}/guile-config.cross
+ echo '))' >> ${B}/guile-config.cross
+ cat ${B}/meta/guile-config >> ${B}/guile-config.cross
+ install ${B}/guile-config.cross ${STAGING_BINDIR_CROSS}/guile-config
fi
}