summaryrefslogtreecommitdiffstats
path: root/meta/packages/gcc
diff options
context:
space:
mode:
authorRichard Purdie <rpurdie@linux.intel.com>2010-07-15 10:19:12 +0100
committerRichard Purdie <rpurdie@linux.intel.com>2010-07-15 10:19:12 +0100
commitbaf69e6a929344368284128038959228e073ed7a (patch)
tree43814ccea0bf162fee1a2862075fc93306111f96 /meta/packages/gcc
parentc50e585588c5e83548c49e95190ff02923b18123 (diff)
downloadpoky-baf69e6a929344368284128038959228e073ed7a.tar.gz
binutils/gcc-crosssdk: Fix hardcoded path layout assumptions for cross toolchains
Signed-off-by: Richard Purdie <rpurdie@linux.intel.com>
Diffstat (limited to 'meta/packages/gcc')
-rw-r--r--meta/packages/gcc/gcc-configure-common.inc4
-rw-r--r--meta/packages/gcc/gcc-cross-canadian_4.3.3.bb1
-rw-r--r--meta/packages/gcc/gcc-crosssdk-initial.inc1
-rw-r--r--meta/packages/gcc/gcc-crosssdk-intermediate.inc1
-rw-r--r--meta/packages/gcc/gcc-crosssdk-intermediate_4.3.3.bb2
-rw-r--r--meta/packages/gcc/gcc-crosssdk.inc5
6 files changed, 11 insertions, 3 deletions
diff --git a/meta/packages/gcc/gcc-configure-common.inc b/meta/packages/gcc/gcc-configure-common.inc
index 58a527b51c..052c5a1bda 100644
--- a/meta/packages/gcc/gcc-configure-common.inc
+++ b/meta/packages/gcc/gcc-configure-common.inc
@@ -50,6 +50,7 @@ ARCH_FLAGS_FOR_TARGET = "${TARGET_CC_ARCH}"
50EXTRA_OEMAKE += "ARCH_FLAGS_FOR_TARGET='${ARCH_FLAGS_FOR_TARGET}'" 50EXTRA_OEMAKE += "ARCH_FLAGS_FOR_TARGET='${ARCH_FLAGS_FOR_TARGET}'"
51 51
52SYSTEMHEADERS = "${target_includedir}" 52SYSTEMHEADERS = "${target_includedir}"
53SYSTEMLIBS = "${target_base_libdir}/"
53SYSTEMLIBS1 = "${target_libdir}/" 54SYSTEMLIBS1 = "${target_libdir}/"
54 55
55do_configure () { 56do_configure () {
@@ -86,6 +87,9 @@ do_configure () {
86 echo "#ifndef STANDARD_INCLUDE_DIR" >> ${S}/gcc/defaults.h.new 87 echo "#ifndef STANDARD_INCLUDE_DIR" >> ${S}/gcc/defaults.h.new
87 echo "#define STANDARD_INCLUDE_DIR \"${SYSTEMHEADERS}\"" >> ${S}/gcc/defaults.h.new 88 echo "#define STANDARD_INCLUDE_DIR \"${SYSTEMHEADERS}\"" >> ${S}/gcc/defaults.h.new
88 echo "#endif" >> ${S}/gcc/defaults.h.new 89 echo "#endif" >> ${S}/gcc/defaults.h.new
90 echo "#ifndef STANDARD_STARTFILE_PREFIX_1" >> ${S}/gcc/defaults.h.new
91 echo "#define STANDARD_STARTFILE_PREFIX_1 \"${SYSTEMLIBS}\"" >> ${S}/gcc/defaults.h.new
92 echo "#endif" >> ${S}/gcc/defaults.h.new
89 echo "#ifndef STANDARD_STARTFILE_PREFIX_2" >> ${S}/gcc/defaults.h.new 93 echo "#ifndef STANDARD_STARTFILE_PREFIX_2" >> ${S}/gcc/defaults.h.new
90 echo "#define STANDARD_STARTFILE_PREFIX_2 \"${SYSTEMLIBS1}\"" >> ${S}/gcc/defaults.h.new 94 echo "#define STANDARD_STARTFILE_PREFIX_2 \"${SYSTEMLIBS1}\"" >> ${S}/gcc/defaults.h.new
91 echo "#endif" >> ${S}/gcc/defaults.h.new 95 echo "#endif" >> ${S}/gcc/defaults.h.new
diff --git a/meta/packages/gcc/gcc-cross-canadian_4.3.3.bb b/meta/packages/gcc/gcc-cross-canadian_4.3.3.bb
index 02a78aa411..756339d6d1 100644
--- a/meta/packages/gcc/gcc-cross-canadian_4.3.3.bb
+++ b/meta/packages/gcc/gcc-cross-canadian_4.3.3.bb
@@ -11,6 +11,7 @@ DEPENDS += "gmp-nativesdk mpfr-nativesdk"
11RDEPENDS_${PN} += "mpfr-nativesdk" 11RDEPENDS_${PN} += "mpfr-nativesdk"
12 12
13SYSTEMHEADERS = "/usr/include" 13SYSTEMHEADERS = "/usr/include"
14SYSTEMLIBS = "/lib/"
14SYSTEMLIBS1 = "/usr/lib/" 15SYSTEMLIBS1 = "/usr/lib/"
15 16
16EXTRA_OECONF += "--disable-libunwind-exceptions --disable-libssp \ 17EXTRA_OECONF += "--disable-libunwind-exceptions --disable-libssp \
diff --git a/meta/packages/gcc/gcc-crosssdk-initial.inc b/meta/packages/gcc/gcc-crosssdk-initial.inc
index 794a953472..eb8d27397d 100644
--- a/meta/packages/gcc/gcc-crosssdk-initial.inc
+++ b/meta/packages/gcc/gcc-crosssdk-initial.inc
@@ -1,6 +1,7 @@
1inherit crosssdk 1inherit crosssdk
2 2
3SYSTEMHEADERS = "${SDKPATHNATIVE}${prefix_nativesdk}/include" 3SYSTEMHEADERS = "${SDKPATHNATIVE}${prefix_nativesdk}/include"
4SYSTEMLIBS = "${SDKPATHNATIVE}${base_libdir_nativesdk}/"
4SYSTEMLIBS1 = "${SDKPATHNATIVE}${libdir_nativesdk}/" 5SYSTEMLIBS1 = "${SDKPATHNATIVE}${libdir_nativesdk}/"
5 6
6DEPENDS = "virtual/${TARGET_PREFIX}binutils-crosssdk gettext-native" 7DEPENDS = "virtual/${TARGET_PREFIX}binutils-crosssdk gettext-native"
diff --git a/meta/packages/gcc/gcc-crosssdk-intermediate.inc b/meta/packages/gcc/gcc-crosssdk-intermediate.inc
index 5b88d33139..ed5d5e838d 100644
--- a/meta/packages/gcc/gcc-crosssdk-intermediate.inc
+++ b/meta/packages/gcc/gcc-crosssdk-intermediate.inc
@@ -1,6 +1,7 @@
1inherit crosssdk 1inherit crosssdk
2 2
3SYSTEMHEADERS = "${SDKPATHNATIVE}${prefix_nativesdk}/include" 3SYSTEMHEADERS = "${SDKPATHNATIVE}${prefix_nativesdk}/include"
4SYSTEMLIBS = "${SDKPATHNATIVE}${base_libdir_nativesdk}/"
4SYSTEMLIBS1 = "${SDKPATHNATIVE}${libdir_nativesdk}/" 5SYSTEMLIBS1 = "${SDKPATHNATIVE}${libdir_nativesdk}/"
5 6
6DEPENDS = "virtual/${TARGET_PREFIX}binutils-crosssdk gettext-native" 7DEPENDS = "virtual/${TARGET_PREFIX}binutils-crosssdk gettext-native"
diff --git a/meta/packages/gcc/gcc-crosssdk-intermediate_4.3.3.bb b/meta/packages/gcc/gcc-crosssdk-intermediate_4.3.3.bb
index c0f5d5cb16..b14dfc32cf 100644
--- a/meta/packages/gcc/gcc-crosssdk-intermediate_4.3.3.bb
+++ b/meta/packages/gcc/gcc-crosssdk-intermediate_4.3.3.bb
@@ -1,3 +1,3 @@
1require gcc-cross-intermediate_${PV}.bb 1require gcc-cross-intermediate_${PV}.bb
2require gcc-crosssdk-intermediate.inc 2require gcc-crosssdk-intermediate.inc
3PR = "r1" 3PR = "r2"
diff --git a/meta/packages/gcc/gcc-crosssdk.inc b/meta/packages/gcc/gcc-crosssdk.inc
index be2d0b0a28..6e7d5a73f9 100644
--- a/meta/packages/gcc/gcc-crosssdk.inc
+++ b/meta/packages/gcc/gcc-crosssdk.inc
@@ -1,6 +1,7 @@
1inherit crosssdk 1inherit crosssdk
2 2
3SYSTEMHEADERS = "${SDKPATHNATIVE}${prefix_nativesdk}/include" 3SYSTEMHEADERS = "${SDKPATHNATIVE}${prefix_nativesdk}/include"
4SYSTEMLIBS = "${SDKPATHNATIVE}${base_libdir_nativesdk}/"
4SYSTEMLIBS1 = "${SDKPATHNATIVE}${libdir_nativesdk}/" 5SYSTEMLIBS1 = "${SDKPATHNATIVE}${libdir_nativesdk}/"
5 6
6GCCMULTILIB = "--disable-multilib" 7GCCMULTILIB = "--disable-multilib"
@@ -10,6 +11,6 @@ PROVIDES = "virtual/${TARGET_PREFIX}gcc-crosssdk virtual/${TARGET_PREFIX}g++-cro
10 11
11do_configure_prepend () { 12do_configure_prepend () {
12 # Change the default dynamic linker path to the one in the SDK 13 # Change the default dynamic linker path to the one in the SDK
13 sed -i ${S}/gcc/config/*/linux*.h -e 's#\(GLIBC_DYNAMIC_LINKER.*\)/lib/#\1${SYSTEMLIBS1}#' 14 sed -i ${S}/gcc/config/*/linux*.h -e 's#\(GLIBC_DYNAMIC_LINKER.*\)/lib/#\1${SYSTEMLIBS}#'
14 sed -i ${S}/gcc/config/*/linux*.h -e 's#\(GLIBC_DYNAMIC_LINKER.*\)/lib64/#\1${SYSTEMLIBS1}#' 15 sed -i ${S}/gcc/config/*/linux*.h -e 's#\(GLIBC_DYNAMIC_LINKER.*\)/lib64/#\1${SYSTEMLIBS}#'
15} 16}