9 files changed, 37 insertions, 62 deletions
diff --git a/meta/packages/gcc/gcc-crosssdk-initial.inc b/meta/packages/gcc/gcc-crosssdk-initial.inc
new file mode 100644
index 000000000..4b8346b00
--- /dev/null
+++ b/meta/packages/gcc/gcc-crosssdk-initial.inc
@@ -0,0 +1,7 @@
+inherit crosssdk
+
+SYSTEMHEADERS = "${SDKPATH}/include"
+SYSTEMLIBS1 = "${SDKPATH}/lib/"
+
+DEPENDS = "virtual/${TARGET_PREFIX}binutils-crosssdk gettext-native"
+PROVIDES = "virtual/${TARGET_PREFIX}gcc-initial-crosssdk"
diff --git a/meta/packages/gcc/gcc-crosssdk-initial_4.2.3.bb b/meta/packages/gcc/gcc-crosssdk-initial_4.2.3.bb
index fdfaa2e25..0c9fdd344 100644
--- a/meta/packages/gcc/gcc-crosssdk-initial_4.2.3.bb
+++ b/meta/packages/gcc/gcc-crosssdk-initial_4.2.3.bb
@@ -1,8 +1,2 @@
 require gcc-cross-initial_${PV}.bb
-inherit crosssdk
-
-SYSTEMHEADERS = "${SDKPATH}/include"
-SYSTEMLIBS1 = "${SDKPATH}/lib/"
-
-DEPENDS = "virtual/${TARGET_PREFIX}binutils-crosssdk"
-PROVIDES = "virtual/${TARGET_PREFIX}gcc-initial-crosssdk"
+require gcc-crosssdk-initial.inc
diff --git a/meta/packages/gcc/gcc-crosssdk-initial_4.3.3.bb b/meta/packages/gcc/gcc-crosssdk-initial_4.3.3.bb
index 4da46bcad..0c9fdd344 100644
--- a/meta/packages/gcc/gcc-crosssdk-initial_4.3.3.bb
+++ b/meta/packages/gcc/gcc-crosssdk-initial_4.3.3.bb
@@ -1,8 +1,2 @@
 require gcc-cross-initial_${PV}.bb
-inherit crosssdk
-
-SYSTEMHEADERS = "${SDKPATH}/include"
-SYSTEMLIBS1 = "${SDKPATH}/lib/"
-
-DEPENDS = "virtual/${TARGET_PREFIX}binutils-crosssdk gettext-native"
-PROVIDES = "virtual/${TARGET_PREFIX}gcc-initial-crosssdk"
+require gcc-crosssdk-initial.inc
diff --git a/meta/packages/gcc/gcc-crosssdk-intermediate.inc b/meta/packages/gcc/gcc-crosssdk-intermediate.inc
new file mode 100644
index 000000000..603436005
--- /dev/null
+++ b/meta/packages/gcc/gcc-crosssdk-intermediate.inc
@@ -0,0 +1,8 @@
+inherit crosssdk
+
+SYSTEMHEADERS = "${SDKPATH}/include"
+SYSTEMLIBS1 = "${SDKPATH}/lib/"
+
+DEPENDS = "virtual/${TARGET_PREFIX}binutils-crosssdk gettext-native"
+DEPENDS += "virtual/${TARGET_PREFIX}libc-initial-nativesdk"
+PROVIDES = "virtual/${TARGET_PREFIX}gcc-intermediate-crosssdk"
diff --git a/meta/packages/gcc/gcc-crosssdk-intermediate_4.2.3.bb b/meta/packages/gcc/gcc-crosssdk-intermediate_4.2.3.bb
index 339ee6341..c0f5d5cb1 100644
--- a/meta/packages/gcc/gcc-crosssdk-intermediate_4.2.3.bb
+++ b/meta/packages/gcc/gcc-crosssdk-intermediate_4.2.3.bb
@@ -1,11 +1,3 @@
 require gcc-cross-intermediate_${PV}.bb
-inherit crosssdk
-
-SYSTEMHEADERS = "${SDKPATH}/include"
-SYSTEMLIBS1 = "${SDKPATH}/lib/"
-
+require gcc-crosssdk-intermediate.inc
 PR = "r1"
-
-DEPENDS = "virtual/${TARGET_PREFIX}binutils-crosssdk"
-DEPENDS += "virtual/${TARGET_PREFIX}libc-initial-nativesdk"
-PROVIDES = "virtual/${TARGET_PREFIX}gcc-intermediate-crosssdk"
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 b2d7583a7..c0f5d5cb1 100644
--- a/meta/packages/gcc/gcc-crosssdk-intermediate_4.3.3.bb
+++ b/meta/packages/gcc/gcc-crosssdk-intermediate_4.3.3.bb
@@ -1,11 +1,3 @@
 require gcc-cross-intermediate_${PV}.bb
-inherit crosssdk
-
-SYSTEMHEADERS = "${SDKPATH}/include"
-SYSTEMLIBS1 = "${SDKPATH}/lib/"
-
+require gcc-crosssdk-intermediate.inc
 PR = "r1"
-
-DEPENDS = "virtual/${TARGET_PREFIX}binutils-crosssdk gettext-native"
-DEPENDS += "virtual/${TARGET_PREFIX}libc-initial-nativesdk"
-PROVIDES = "virtual/${TARGET_PREFIX}gcc-intermediate-crosssdk"
diff --git a/meta/packages/gcc/gcc-crosssdk.inc b/meta/packages/gcc/gcc-crosssdk.inc
new file mode 100644
index 000000000..df3ff9607
--- /dev/null
+++ b/meta/packages/gcc/gcc-crosssdk.inc
@@ -0,0 +1,16 @@
+require gcc-cross_${PV}.bb
+inherit crosssdk
+
+SYSTEMHEADERS = "${SDKPATH}/include"
+SYSTEMLIBS1 = "${SDKPATH}/lib/"
+
+GCCMULTILIB = "--disable-multilib"
+
+DEPENDS = "virtual/${TARGET_PREFIX}binutils-crosssdk virtual/${TARGET_PREFIX}libc-for-gcc-nativesdk gettext-native"
+PROVIDES = "virtual/${TARGET_PREFIX}gcc-crosssdk virtual/${TARGET_PREFIX}g++-crosssdk"
+
+do_configure_prepend () {
+	# Change the default dynamic linker path to the one in the SDK
+	sed -i ${S}/gcc/config/*/linux*.h -e 's#\(GLIBC_DYNAMIC_LINKER.*\)/lib/#\1${SYSTEMLIBS1}#'
+	sed -i ${S}/gcc/config/*/linux*.h -e 's#\(GLIBC_DYNAMIC_LINKER.*\)/lib64/#\1${SYSTEMLIBS1}#'
+}
diff --git a/meta/packages/gcc/gcc-crosssdk_4.2.3.bb b/meta/packages/gcc/gcc-crosssdk_4.2.3.bb
index 3a3d44341..7430888ed 100644
--- a/meta/packages/gcc/gcc-crosssdk_4.2.3.bb
+++ b/meta/packages/gcc/gcc-crosssdk_4.2.3.bb
@@ -1,16 +1,2 @@
 require gcc-cross_${PV}.bb
-inherit crosssdk
-
-SYSTEMHEADERS = "${SDKPATH}/include"
-SYSTEMLIBS1 = "${SDKPATH}/lib/"
-
-GCCMULTILIB = "--disable-multilib"
-
-DEPENDS = "virtual/${TARGET_PREFIX}binutils-crosssdk virtual/${TARGET_PREFIX}libc-for-gcc-nativesdk"
-PROVIDES = "virtual/${TARGET_PREFIX}gcc-crosssdk virtual/${TARGET_PREFIX}g++-crosssdk"
-
-do_configure_prepend () {
-	# Change the default dynamic linker path to the one in the SDK
-	sed -i ${S}/gcc/config/*/linux*.h -e 's#\(GLIBC_DYNAMIC_LINKER.*\)/lib/#\1${SYSTEMLIBS1}#'
-	sed -i ${S}/gcc/config/*/linux*.h -e 's#\(GLIBC_DYNAMIC_LINKER.*\)/lib64/#\1${SYSTEMLIBS1}#'
-}
+require gcc-crosssdk.inc
diff --git a/meta/packages/gcc/gcc-crosssdk_4.3.3.bb b/meta/packages/gcc/gcc-crosssdk_4.3.3.bb
index df3ff9607..7430888ed 100644
--- a/meta/packages/gcc/gcc-crosssdk_4.3.3.bb
+++ b/meta/packages/gcc/gcc-crosssdk_4.3.3.bb
@@ -1,16 +1,2 @@
 require gcc-cross_${PV}.bb
-inherit crosssdk
-
-SYSTEMHEADERS = "${SDKPATH}/include"
-SYSTEMLIBS1 = "${SDKPATH}/lib/"
-
-GCCMULTILIB = "--disable-multilib"
-
-DEPENDS = "virtual/${TARGET_PREFIX}binutils-crosssdk virtual/${TARGET_PREFIX}libc-for-gcc-nativesdk gettext-native"
-PROVIDES = "virtual/${TARGET_PREFIX}gcc-crosssdk virtual/${TARGET_PREFIX}g++-crosssdk"
-
-do_configure_prepend () {
-	# Change the default dynamic linker path to the one in the SDK
-	sed -i ${S}/gcc/config/*/linux*.h -e 's#\(GLIBC_DYNAMIC_LINKER.*\)/lib/#\1${SYSTEMLIBS1}#'
-	sed -i ${S}/gcc/config/*/linux*.h -e 's#\(GLIBC_DYNAMIC_LINKER.*\)/lib64/#\1${SYSTEMLIBS1}#'
-}
+require gcc-crosssdk.inc