gcc-4.5.0: Move away from legacy staging.

* Define EXTRA_OECONF_INITIAL and EXTRA_OECONF_INTERMEDIATE variables
* Remove redundant require statements.
* Cleanup DEPENDS and use NATIVEDEPS.

Signed-off-by: Khem Raj <raj.khem@gmail.com>

5 files changed, 6 insertions, 21 deletions

diff --git a/recipes/gcc/gcc-4.5.0.inc b/recipes/gcc/gcc-4.5.0.inc
index 357592fbe6..42b039386c 100644
--- a/recipes/gcc/gcc-4.5.0.inc
+++ b/recipes/gcc/gcc-4.5.0.inc
@@ -5,10 +5,11 @@ require gcc-common.inc
 LICENSE = "GPLv3"
 
 DEPENDS = "mpfr gmp libmpc"
+NATIVEDEPS = "mpfr-native gmp-native libmpc-native"
 
 FILESPATHPKG .= ":gcc-$PV"
 
-INC_PR = "r0"
+INC_PR = "r1"
 
 SRC_URI = "${GNU_MIRROR}/gcc/gcc-${PV}/gcc-${PV}.tar.bz2;name=gcc450tarbz2 \
 	   file://gcc-4.3.1-ARCH_FLAGS_FOR_TARGET.patch;patch=1 \
@@ -29,6 +30,9 @@ EXTRA_OECONF_BASE = " --enable-libssp \
 SRC_URI[gcc450tarbz2.md5sum] = "ff27b7c4a5d5060c8a8543a44abca31f"
 SRC_URI[gcc450tarbz2.sha256sum] = "8293e9efa68a8ec0fdd0dae9c9bd128a8e742566acd9c8fbcfe79d98ed3756c8"
 
+EXTRA_OECONF_INITIAL = "--disable-libmudflap --disable-libgomp --disable-libssp --enable-decimal-float=no"
+EXTRA_OECONF_INTERMEDIATE = "--disable-libmudflap --disable-libgomp --disable-libssp"
+
 EXTRA_OECONF_append_linux-uclibc = " --disable-decimal-float "
 EXTRA_OECONF_append_linux-uclibceabi = " --disable-decimal-float "
 EXTRA_OECONF_append_linux-uclibcspe = " --disable-decimal-float "
diff --git a/recipes/gcc/gcc-cross-initial_4.5.0.bb b/recipes/gcc/gcc-cross-initial_4.5.0.bb
index 8356dd1fac..1639511362 100644
--- a/recipes/gcc/gcc-cross-initial_4.5.0.bb
+++ b/recipes/gcc/gcc-cross-initial_4.5.0.bb
@@ -1,9 +1,2 @@
 require gcc-cross_${PV}.bb
 require gcc-cross-initial.inc
-
-DEPENDS += "gmp-native mpfr-native libmpc-native"
-
-EXTRA_OECONF += " --disable-libmudflap \
-		  --disable-libgomp \
-		  --enable-decimal-float=no \
-		  --disable-libssp"
diff --git a/recipes/gcc/gcc-cross-intermediate_4.5.0.bb b/recipes/gcc/gcc-cross-intermediate_4.5.0.bb
index b816c8b81c..eb59de9461 100644
--- a/recipes/gcc/gcc-cross-intermediate_4.5.0.bb
+++ b/recipes/gcc/gcc-cross-intermediate_4.5.0.bb
@@ -1,8 +1,2 @@
 require gcc-cross_${PV}.bb
 require gcc-cross-intermediate.inc
-
-DEPENDS += "libmpc-native gmp-native mpfr-native"
-
-EXTRA_OECONF += " --disable-libmudflap \
-		  --disable-libgomp \
-		  --disable-libssp"
diff --git a/recipes/gcc/gcc-cross-sdk_4.5.0.bb b/recipes/gcc/gcc-cross-sdk_4.5.0.bb
index 48d8a0d1ed..a316cd282e 100644
--- a/recipes/gcc/gcc-cross-sdk_4.5.0.bb
+++ b/recipes/gcc/gcc-cross-sdk_4.5.0.bb
@@ -1,13 +1,9 @@
-PR = "r1"
+PR = "r2"
 
 inherit sdk
 
 require gcc-${PV}.inc
 require gcc-cross-sdk.inc
-require gcc-configure-sdk.inc
-require gcc-package-sdk.inc
-
-DEPENDS += "libmpc-native gmp-native mpfr-native"
 
 EXTRA_OECONF += "--disable-libunwind-exceptions --disable-libssp \
 		--disable-libgomp --disable-libmudflap \
diff --git a/recipes/gcc/gcc-cross_4.5.0.bb b/recipes/gcc/gcc-cross_4.5.0.bb
index 2d3c1368dc..3ffaa3adb4 100644
--- a/recipes/gcc/gcc-cross_4.5.0.bb
+++ b/recipes/gcc/gcc-cross_4.5.0.bb
@@ -1,8 +1,6 @@
 PR = "r0"
 require gcc-${PV}.inc
 require gcc-cross4.inc
-require gcc-configure-cross.inc
-require gcc-package-cross.inc
 
 DEPENDS += "libmpc-native"