gcc-4.3/4.4: correct flags passed to native parts of the build

Target CFLAGS (LIBCFLAGS in fact) are leaking into native parts of the
build. Fix that (thus making gcc buildable for ppc, e.g.).

Signed-off-by: Dmitry Eremin-Solenikov <dbaryshkov@gmail.com>

diff --git a/recipes/gcc/files/gcc-4.3.3-fix-EXTRA_BUILD.patch b/recipes/gcc/files/gcc-4.3.3-fix-EXTRA_BUILD.patch
new file mode 100644 (file)
index 0000000..8a2a4c4
--- /dev/null
+++ b/recipes/gcc/files/gcc-4.3.3-fix-EXTRA_BUILD.patch
@@ -0,0 +1,12 @@
+Index: gcc-4.3.3/Makefile.in
+===================================================================
+--- gcc-4.3.3.orig/Makefile.in 2010-06-16 18:04:38.379008150 +0400
++++ gcc-4.3.3/Makefile.in      2010-06-16 18:05:29.115006261 +0400
+@@ -148,6 +148,7 @@
+ # built for the build system to override those in BASE_FLAGS_TO_PASSS.
+ EXTRA_BUILD_FLAGS = \
+       CFLAGS="$(CFLAGS_FOR_BUILD)" \
++      LIBCFLAGS="$(CFLAGS_FOR_BUILD)" \
+       LDFLAGS="$(LDFLAGS_FOR_BUILD)"
+ 
+ # This is the list of directories to built for the host system.

diff --git a/recipes/gcc/gcc-4.3.1.inc b/recipes/gcc/gcc-4.3.1.inc
index 3352868..04c0246 100644 (file)
--- a/recipes/gcc/gcc-4.3.1.inc
+++ b/recipes/gcc/gcc-4.3.1.inc
@@ -61,6 +61,7 @@ SRC_URI = "${GNU_MIRROR}/gcc/gcc-${PV}/gcc-${PV}.tar.bz2;name=archive \
        file://gcc-4.3.1-SYSROOT_CFLAGS_FOR_TARGET.patch \
        file://gcc-4.3.1-ARCH_FLAGS_FOR_TARGET.patch \
        file://zecke-xgcc-cpp.patch \
+       file://gcc-4.3.3-fix-EXTRA_BUILD.patch \
        file://gcc-flags-for-build.patch \
 "
 

diff --git a/recipes/gcc/gcc-4.3.2.inc b/recipes/gcc/gcc-4.3.2.inc
index 897d4f3..a3ef606 100644 (file)
--- a/recipes/gcc/gcc-4.3.2.inc
+++ b/recipes/gcc/gcc-4.3.2.inc
@@ -57,6 +57,7 @@ SRC_URI = "${GNU_MIRROR}/gcc/gcc-${PV}/gcc-${PV}.tar.bz2;name=archive \
        file://gcc-4.3.2-SYSROOT_CFLAGS_FOR_TARGET.patch \
        file://gcc-4.3.1-ARCH_FLAGS_FOR_TARGET.patch \
        file://zecke-xgcc-cpp.patch \
+       file://gcc-4.3.3-fix-EXTRA_BUILD.patch \
        file://gcc-flags-for-build.patch \
 "
 

diff --git a/recipes/gcc/gcc-4.3.3.inc b/recipes/gcc/gcc-4.3.3.inc
index 77cd521..e39b119 100644 (file)
--- a/recipes/gcc/gcc-4.3.3.inc
+++ b/recipes/gcc/gcc-4.3.3.inc
@@ -8,7 +8,7 @@ LICENSE = "GPLv3"
 DEPENDS = "mpfr gmp"
 NATIVEDEPS = "mpfr-native gmp-native"
 
-INC_PR = "r12"
+INC_PR = "r13"
 
 SRC_URI = "${GNU_MIRROR}/gcc/gcc-${PV}/gcc-${PV}.tar.bz2;name=archive \
        file://fedora/gcc43-c++-builtin-redecl.patch;striplevel=0 \
@@ -59,6 +59,7 @@ SRC_URI = "${GNU_MIRROR}/gcc/gcc-${PV}/gcc-${PV}.tar.bz2;name=archive \
        file://gcc-flags-for-build.patch \
        file://gcc-pr36218.patch \
        file://gcc-4.3.3-SYSROOT_CFLAGS_FOR_TARGET.patch \
+       file://gcc-4.3.3-fix-EXTRA_BUILD.patch \
         file://arm-gcc-objective.patch \
 "
 

diff --git a/recipes/gcc/gcc-4.3.4.inc b/recipes/gcc/gcc-4.3.4.inc
index 9711813..b9531d5 100644 (file)
--- a/recipes/gcc/gcc-4.3.4.inc
+++ b/recipes/gcc/gcc-4.3.4.inc
@@ -57,6 +57,7 @@ SRC_URI = "${GNU_MIRROR}/gcc/gcc-${PV}/gcc-${PV}.tar.bz2;name=archive \
        file://gcc-4.3.4-SYSROOT_CFLAGS_FOR_TARGET.patch \
        file://gcc-4.3.1-ARCH_FLAGS_FOR_TARGET.patch \
        file://zecke-xgcc-cpp.patch \
+       file://gcc-4.3.3-fix-EXTRA_BUILD.patch \
        file://gcc-flags-for-build.patch \
 "
 

diff --git a/recipes/gcc/gcc-4.4.1.inc b/recipes/gcc/gcc-4.4.1.inc
index 11b1535..c4138b8 100644 (file)
--- a/recipes/gcc/gcc-4.4.1.inc
+++ b/recipes/gcc/gcc-4.4.1.inc
@@ -25,6 +25,7 @@ SRC_URI = "${GNU_MIRROR}/gcc/gcc-${PV}/gcc-${PV}.tar.bz2;name=archive \
        file://gcc-ppc_add_d_constraint.patch \
        file://gcc-pr41175.patch \
        file://gcc-armv4-pass-fix-v4bx-to-ld.patch \
+       file://gcc-4.3.3-fix-EXTRA_BUILD.patch \
        "
 # Language Overrides
 FORTRAN = ""

diff --git a/recipes/gcc/gcc-4.4.2.inc b/recipes/gcc/gcc-4.4.2.inc
index 8d14c99..0ad3fe5 100644 (file)
--- a/recipes/gcc/gcc-4.4.2.inc
+++ b/recipes/gcc/gcc-4.4.2.inc
@@ -25,6 +25,7 @@ SRC_URI = "${GNU_MIRROR}/gcc/gcc-${PV}/gcc-${PV}.tar.bz2;name=archive \
        file://gcc-ppc_add_d_constraint.patch \
        file://gcc-pr41175.patch \
        file://gcc-armv4-pass-fix-v4bx-to-ld.patch \
+       file://gcc-4.3.3-fix-EXTRA_BUILD.patch \
        "
 # Language Overrides
 FORTRAN = ""

diff --git a/recipes/gcc/gcc-4.4.4.inc b/recipes/gcc/gcc-4.4.4.inc
index 4dd1bf6..37c8cd0 100644 (file)
--- a/recipes/gcc/gcc-4.4.4.inc
+++ b/recipes/gcc/gcc-4.4.4.inc
@@ -26,6 +26,7 @@ SRC_URI = "${GNU_MIRROR}/gcc/gcc-${PV}/gcc-${PV}.tar.bz2;name=gcc444tarbz2 \
        file://gcc-pr41175.patch \
        file://gcc-armv4-pass-fix-v4bx-to-ld.patch \
        file://gcc-add-t-slibgcc-libgcc.patch \
+       file://gcc-4.3.3-fix-EXTRA_BUILD.patch \
        "
 SRC_URI[gcc444tarbz2.md5sum] = "7ff5ce9e5f0b088ab48720bbd7203530"
 SRC_URI[gcc444tarbz2.sha256sum] = "e1c13696b45752ad3f652304fab5120a43a8a5c0f438d3bda78cf16b620c0c58"