summaryrefslogtreecommitdiff
path: root/meta/recipes-devtools
diff options
context:
space:
mode:
authorRichard Purdie <richard.purdie@linuxfoundation.org>2012-04-15 12:02:18 +0100
committerRichard Purdie <richard.purdie@linuxfoundation.org>2012-04-15 12:06:36 +0100
commit7a254d8294cfbe4b717d083c3d7fcc5515a5ab4f (patch)
tree1c0b09d1bf17ccc3466e4d428e59a8d6b34f0d25 /meta/recipes-devtools
parent82744f56f8bfbdcc303034dee3d6e188cf8180b1 (diff)
downloadopenembedded-core-7a254d8294cfbe4b717d083c3d7fcc5515a5ab4f.tar.gz
openembedded-core-7a254d8294cfbe4b717d083c3d7fcc5515a5ab4f.tar.bz2
openembedded-core-7a254d8294cfbe4b717d083c3d7fcc5515a5ab4f.tar.xz
openembedded-core-7a254d8294cfbe4b717d083c3d7fcc5515a5ab4f.zip
guile: Fix binary relocation issue for precompiled guile objects
When guile-native was relocated, there were messages like: ;;; note: source file /srv/home/pokybuild/yocto-autobuilder/yocto-slave/emenlow/build/build/tmp/sysroots/x86_64-linux/usr/share/guile/2.0/ice-9/eval.scm ;;; newer than compiled /srv/home/pokybuild/yocto-autobuilder/yocto-slave/fri2/build/build/tmp/sysroots/x86_64-linux/usr/lib/guile/2.0/ccache/ice-9/eval.go and this confuses things like the autogen-native "guile --version" check. This patch ensures the wrapper script sets the necessary variables correctly. Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-devtools')
-rw-r--r--meta/recipes-devtools/guile/guile_2.0.3.bb8
1 files changed, 5 insertions, 3 deletions
diff --git a/meta/recipes-devtools/guile/guile_2.0.3.bb b/meta/recipes-devtools/guile/guile_2.0.3.bb
index b638a180d..164ab8c64 100644
--- a/meta/recipes-devtools/guile/guile_2.0.3.bb
+++ b/meta/recipes-devtools/guile/guile_2.0.3.bb
@@ -24,7 +24,7 @@ SRC_URI = "${GNU_MIRROR}/guile/guile-${PV}.tar.gz \
SRC_URI[md5sum] = "3b8b4e1083037f29d2c4704a6d55f2a8"
SRC_URI[sha256sum] = "a53b21159befe3e89bbaca71e9e62cf00af0f49fcca297c407944b988d59eb08"
-PR = "r4"
+PR = "r5"
inherit autotools gettext
BBCLASSEXTEND = "native"
@@ -58,9 +58,11 @@ do_install_append_virtclass-native() {
install -m 0755 ${D}${bindir}/guile ${D}${bindir}/${HOST_SYS}-guile
create_wrapper ${D}/${bindir}/guile \
- GUILE_LOAD_PATH=${STAGING_DATADIR_NATIVE}/guile/2.0
+ GUILE_LOAD_PATH=${STAGING_DATADIR_NATIVE}/guile/2.0 \
+ GUILE_LOAD_COMPILED_PATH=${STAGING_LIBDIR_NATIVE}/guile/2.0/ccache
create_wrapper ${D}${bindir}/${HOST_SYS}-guile
- GUILE_LOAD_PATH=${STAGING_DATADIR_NATIVE}/guile/2.0
+ GUILE_LOAD_PATH=${STAGING_DATADIR_NATIVE}/guile/2.0 \
+ GUILE_LOAD_COMPILED_PATH=${STAGING_LIBDIR_NATIVE}/guile/2.0/ccache
}
SYSROOT_PREPROCESS_FUNCS = "guile_cross_config"