From 061df5abaf727741b11c05db2c47e2778f96d96e Mon Sep 17 00:00:00 2001 From: Richard Purdie Date: Fri, 2 Jul 2010 14:35:08 +0100 Subject: meta-toolchain: Improve layout * Switch from /usr/local/poky to /opt/poky * Use a sysroots directory for both the "native" sdk binaries and the target * Drop the meta-toolchain extras packages. These are replaced with packaged-staging. * Change the nativesdk layout to match our usual filesystem layout * Clean up various hardcoded prefix references Signed-off-by: Richard Purdie --- meta/packages/gcc/gcc-crosssdk-initial.inc | 4 ++-- meta/packages/gcc/gcc-crosssdk-intermediate.inc | 4 ++-- meta/packages/gcc/gcc-crosssdk.inc | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) (limited to 'meta/packages/gcc') diff --git a/meta/packages/gcc/gcc-crosssdk-initial.inc b/meta/packages/gcc/gcc-crosssdk-initial.inc index 4b8346b00..794a95347 100644 --- a/meta/packages/gcc/gcc-crosssdk-initial.inc +++ b/meta/packages/gcc/gcc-crosssdk-initial.inc @@ -1,7 +1,7 @@ inherit crosssdk -SYSTEMHEADERS = "${SDKPATH}/include" -SYSTEMLIBS1 = "${SDKPATH}/lib/" +SYSTEMHEADERS = "${SDKPATHNATIVE}${prefix_nativesdk}/include" +SYSTEMLIBS1 = "${SDKPATHNATIVE}${libdir_nativesdk}/" DEPENDS = "virtual/${TARGET_PREFIX}binutils-crosssdk gettext-native" PROVIDES = "virtual/${TARGET_PREFIX}gcc-initial-crosssdk" diff --git a/meta/packages/gcc/gcc-crosssdk-intermediate.inc b/meta/packages/gcc/gcc-crosssdk-intermediate.inc index 603436005..5b88d3313 100644 --- a/meta/packages/gcc/gcc-crosssdk-intermediate.inc +++ b/meta/packages/gcc/gcc-crosssdk-intermediate.inc @@ -1,7 +1,7 @@ inherit crosssdk -SYSTEMHEADERS = "${SDKPATH}/include" -SYSTEMLIBS1 = "${SDKPATH}/lib/" +SYSTEMHEADERS = "${SDKPATHNATIVE}${prefix_nativesdk}/include" +SYSTEMLIBS1 = "${SDKPATHNATIVE}${libdir_nativesdk}/" DEPENDS = "virtual/${TARGET_PREFIX}binutils-crosssdk gettext-native" DEPENDS += "virtual/${TARGET_PREFIX}libc-initial-nativesdk" diff --git a/meta/packages/gcc/gcc-crosssdk.inc b/meta/packages/gcc/gcc-crosssdk.inc index e2252bbfc..be2d0b0a2 100644 --- a/meta/packages/gcc/gcc-crosssdk.inc +++ b/meta/packages/gcc/gcc-crosssdk.inc @@ -1,7 +1,7 @@ inherit crosssdk -SYSTEMHEADERS = "${SDKPATH}/include" -SYSTEMLIBS1 = "${SDKPATH}/lib/" +SYSTEMHEADERS = "${SDKPATHNATIVE}${prefix_nativesdk}/include" +SYSTEMLIBS1 = "${SDKPATHNATIVE}${libdir_nativesdk}/" GCCMULTILIB = "--disable-multilib" -- cgit v1.2.3