From 11ab6e41b1131ea489e69c868ba2767201d39f93 Mon Sep 17 00:00:00 2001 From: Andreas Müller Date: Tue, 28 Feb 2012 11:43:22 +0000 Subject: gcc: same patches for all gccs with shared sources MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * different patching on same sources caused race contition [1] * build tested from scratch [1] http://lists.linuxtogo.org/pipermail/openembedded-core/2012-February/018296.html Signed-off-by: Andreas Müller Signed-off-by: Koen Kooi --- meta-oe/recipes-devtools/gcc/gcc-4.5.inc | 4 +++- meta-oe/recipes-devtools/gcc/gcc-runtime_4.5.bb | 2 -- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/meta-oe/recipes-devtools/gcc/gcc-4.5.inc b/meta-oe/recipes-devtools/gcc/gcc-4.5.inc index 82dd15715f..d1802b5660 100644 --- a/meta-oe/recipes-devtools/gcc/gcc-4.5.inc +++ b/meta-oe/recipes-devtools/gcc/gcc-4.5.inc @@ -14,7 +14,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=59530bdf33659b29e73d4adb9f9f6552 \ PV = "4.5" -PR = "r45" +PR = "r46" # BINV should be incremented after updating to a revision # after a minor gcc release (e.g. 4.5.1 or 4.5.2) has been made @@ -233,6 +233,8 @@ SRC_URI = "svn://gcc.gnu.org/svn/gcc/branches;module=${BRANCH};proto=http \ file://use-defaults.h-and-t-oe-in-B.patch \ file://gcc-with-linker-hash-style.patch \ file://GPLUSPLUS_INCLUDE_DIR_with_sysroot.patch \ + \ + file://fortran-cross-compile-hack.patch \ " # Language Overrides diff --git a/meta-oe/recipes-devtools/gcc/gcc-runtime_4.5.bb b/meta-oe/recipes-devtools/gcc/gcc-runtime_4.5.bb index a34ab40ffb..e3b2d4ef76 100644 --- a/meta-oe/recipes-devtools/gcc/gcc-runtime_4.5.bb +++ b/meta-oe/recipes-devtools/gcc/gcc-runtime_4.5.bb @@ -3,8 +3,6 @@ require recipes-devtools/gcc/gcc-${PV}.inc require recipes-devtools/gcc/gcc-configure-runtime.inc require recipes-devtools/gcc/gcc-package-runtime.inc -SRC_URI_append = "file://fortran-cross-compile-hack.patch" - ARCH_FLAGS_FOR_TARGET += "-isystem${STAGING_INCDIR}" EXTRA_OECONF += "--disable-libunwind-exceptions" -- cgit v1.2.3-54-g00ecf