From patchwork Tue Oct  2 13:16:35 2012
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
Subject: nativesdk.bbclass: Ensure we have chrpath >=0.14
Date: Tue, 02 Oct 2012 13:16:35 -0000
From: Richard Purdie <richard.purdie@linuxfoundation.org>
X-Patchwork-Id: 37603
Message-Id: <1349183795.15753.152.camel@ted>
To: openembedded-core <openembedded-core@lists.openembedded.org>

Versions earlier than 0.14 can't cope with 32 bit binaries on a 64 bit
system and vice versa. This results in problems for certain SDKMACHINE 
combinations on certain hosts. By ensuring we build
chrpath-replacement-native we avoid this problems and the binaries work
correctly.

[YOCTO #3161]
[YOCTO #3201]

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

---


diff --git a/meta/classes/nativesdk.bbclass b/meta/classes/nativesdk.bbclass
index 3334817..e2971d1 100644
--- a/meta/classes/nativesdk.bbclass
+++ b/meta/classes/nativesdk.bbclass
@@ -16,6 +16,13 @@ CLASSOVERRIDE = "class-nativesdk"
 PACKAGE_ARCH = "${SDK_ARCH}-nativesdk"
 PACKAGE_ARCHS = "${SDK_PACKAGE_ARCHS}"
 
+#
+# We need chrpath >= 0.14 to ensure we can deal with 32 and 64 bit
+# binaries
+#
+DEPENDS_append = " chrpath-replacement-native"
+EXTRANATIVEPATH += "chrpath-native"
+
 STAGING_DIR_HOST = "${STAGING_DIR}/${MULTIMACH_HOST_SYS}"
 STAGING_DIR_TARGET = "${STAGING_DIR}/${MULTIMACH_TARGET_SYS}"