[oe-commits] Richard Purdie : autogen-native: Fix sstate relocation issue when reusing libguile

[git at git.openembedded.org]

Module: openembedded-core.git
Branch: master
Commit: d928e91a57e6e9dfa6a7d4e888e1e1064d7fc668
URL:    http://git.openembedded.org/?p=openembedded-core.git&a=commit;h=d928e91a57e6e9dfa6a7d4e888e1e1064d7fc668

Author: Richard Purdie <richard.purdie at linuxfoundation.org>
Date:   Mon Apr 16 22:08:18 2012 +0100

autogen-native: Fix sstate relocation issue when reusing libguile

This was found to cause issues on the Yocto autobuilders and fixes do_compile
failures when guile-native has been relocated.

Signed-off-by: Richard Purdie <richard.purdie at linuxfoundation.org>

---

 .../autogen/autogen-native_5.12.bb                 |   13 ++++++++++++-
 1 files changed, 12 insertions(+), 1 deletions(-)

diff --git a/meta/recipes-devtools/autogen/autogen-native_5.12.bb b/meta/recipes-devtools/autogen/autogen-native_5.12.bb
index cdf1ea9..eb3721d 100644
--- a/meta/recipes-devtools/autogen/autogen-native_5.12.bb
+++ b/meta/recipes-devtools/autogen/autogen-native_5.12.bb
@@ -13,7 +13,7 @@ SRC_URI = "${GNU_MIRROR}/autogen/rel${PV}/autogen-${PV}.tar.gz"
 SRC_URI[md5sum] = "6c6671b76021fb30dd43b0d5fdb7180b"
 SRC_URI[sha256sum] = "37e885d6c8a58f33ab198d38bb972fa4c14236f951d628161dde6e20527d0df2"
 
-PR = "r1"
+PR = "r2"
 
 DEPENDS = "guile-native libtool-native libxml2-native"
 RDEPENDS = "automake pkgconfig"
@@ -22,3 +22,14 @@ inherit autotools native
 
 # Following line will be needed for the non-native target recipe.
 #CFLAGS += "-L${STAGING_LIBDIR} -lguile-2.0 -lgc -pthread -I${STAGING_INCDIR}/guile/2.0 -I${STAGING_INCDIR}"
+
+# autogen-native links against libguile which may have been relocated with sstate
+# these environment variables ensure there isn't a relocation issue
+export GUILE_LOAD_PATH = "${STAGING_DATADIR_NATIVE}/guile/2.0"
+export GUILE_LOAD_COMPILED_PATH = "${STAGING_LIBDIR_NATIVE}/guile/2.0/ccache"
+
+do_install_append () {
+	create_wrapper ${D}/${bindir}/autogen \
+		GUILE_LOAD_PATH=${STAGING_DATADIR_NATIVE}/guile/2.0 \
+		GUILE_LOAD_COMPILED_PATH=${STAGING_LIBDIR_NATIVE}/guile/2.0/ccache
+}