gcc-4.2.2: Move gcc only SRC_URI append from .inc to .bb

diff --git a/packages/gcc/gcc-4.2.2.inc b/packages/gcc/gcc-4.2.2.inc
index 79277d3a068bbbfb8fc9da236f8d6eda1e6413e5..4959cc711fa083084f08af18aa62960f4ab6de5b 100644 (file)
--- a/packages/gcc/gcc-4.2.2.inc
+++ b/packages/gcc/gcc-4.2.2.inc
@@ -77,12 +77,5 @@ LANGUAGES = "c,c++${FORTRAN}${JAVA}"
 require gcc3-build.inc
 ARCH_FLAGS_FOR_TARGET=-isystem${STAGING_INCDIR}
 
-
 EXTRA_OECONF += " --disable-libssp --disable-bootstrap "
 
-# We know some one is including us, but we only want to apply this fortran hack for the real gcc
-python __anonymous () {
-    import bb
-    if bb.data.getVar('PN', d, True) == "gcc":
-        bb.data.setVar('SRC_URI_append', ' file://fortran-cross-compile-hack.patch;patch=1', d)
-}

diff --git a/packages/gcc/gcc-cross_3.3.3.bb b/packages/gcc/gcc-cross_3.3.3.bb
index b59b9afd4d438438b0373ea4fe5534a2ded367fc..b64756246c1f461d61e175fb0e29e9afa571e262 100644 (file)
--- a/packages/gcc/gcc-cross_3.3.3.bb
+++ b/packages/gcc/gcc-cross_3.3.3.bb
@@ -1,7 +1,6 @@
 PR = "r3"
 
 require gcc-${PV}.inc
-require gcc-package-target.inc
 require gcc-cross.inc
 require gcc-package-cross.inc
 

diff --git a/packages/gcc/gcc_4.2.2.bb b/packages/gcc/gcc_4.2.2.bb
index b553b20f72d9a1f71fd47c563df0c609304daa9c..a32b55f91f1bac23e7f46c7fcc51430c8b9fb05a 100644 (file)
--- a/packages/gcc/gcc_4.2.2.bb
+++ b/packages/gcc/gcc_4.2.2.bb
@@ -2,3 +2,6 @@ PR = "r6"
 
 require gcc-${PV}.inc
 require gcc-package-target.inc
+
+SRC_URI_append = "file://fortran-cross-compile-hack.patch;patch=1"
+