gcc-cross-initial: Move common code to gcc-cross-initial.inc

git-svn-id: https://svn.o-hand.com/repos/poky/trunk@2757 311d38ba-8fff-0310-9ca6-ca027cbcb966

8 files changed, 37 insertions, 184 deletions

diff --git a/meta/packages/gcc/gcc-cross-initial.inc b/meta/packages/gcc/gcc-cross-initial.inc
new file mode 100644
index 0000000000..49e1937b06
--- /dev/null
+++ b/meta/packages/gcc/gcc-cross-initial.inc
@@ -0,0 +1,25 @@
+DEPENDS = "virtual/${TARGET_PREFIX}binutils"
+DEPENDS += "${@['virtual/${TARGET_PREFIX}libc-initial',''][bb.data.getVar('TARGET_ARCH', d, 1) in ['arm', 'armeb', 'mips', 'mipsel']]}"
+PROVIDES = "virtual/${TARGET_PREFIX}gcc-initial"
+PACKAGES = ""
+
+# This is intended to be a -very- basic config
+EXTRA_OECONF = "--with-local-prefix=${CROSS_DIR}/${TARGET_SYS} \
+		--with-newlib \
+		--disable-shared \
+		--disable-threads \
+		--disable-multilib \
+		--disable-__cxa_atexit \
+		--enable-languages=c \
+		--enable-target-optspace \
+		--program-prefix=${TARGET_PREFIX} \
+		${@get_gcc_fpu_setting(bb, d)}"
+
+do_stage_prepend () {
+	mkdir -p ${CROSS_DIR}/lib/gcc/${TARGET_SYS}/${BINV}
+	ln -sf libgcc.a ${CROSS_DIR}/lib/gcc/${TARGET_SYS}/${BINV}/libgcc_eh.a
+}
+
+do_install () {
+	:
+}
diff --git a/meta/packages/gcc/gcc-cross-initial_3.3.4.bb b/meta/packages/gcc/gcc-cross-initial_3.3.4.bb
index 0fb0511176..1639511362 100644
--- a/meta/packages/gcc/gcc-cross-initial_3.3.4.bb
+++ b/meta/packages/gcc/gcc-cross-initial_3.3.4.bb
@@ -1,27 +1,2 @@
 require gcc-cross_${PV}.bb
-
-DEPENDS = "virtual/${TARGET_PREFIX}binutils"
-DEPENDS += "${@['virtual/${TARGET_PREFIX}libc-initial',''][bb.data.getVar('TARGET_ARCH', d, 1) in ['arm', 'armeb', 'mips', 'mipsel']]}"
-PROVIDES = "virtual/${TARGET_PREFIX}gcc-initial"
-PACKAGES = ""
-
-# This is intended to be a -very- basic config
-EXTRA_OECONF = "--with-local-prefix=${CROSS_DIR}/${TARGET_SYS} \
-		--with-newlib \
-		--disable-shared \
-		--disable-threads \
-		--disable-multilib \
-		--disable-__cxa_atexit \
-		--enable-languages=c \
-		--enable-target-optspace \
-		--program-prefix=${TARGET_PREFIX} \
-		${@get_gcc_fpu_setting(bb, d)}"
-
-do_stage_prepend () {
-	mkdir -p ${CROSS_DIR}/lib/gcc-lib/${TARGET_SYS}/${PV}
-	ln -sf libgcc.a ${CROSS_DIR}/lib/gcc-lib/${TARGET_SYS}/${PV}/libgcc_eh.a
-}
-
-do_install () {
-	:
-}
+require gcc-cross-initial.inc
diff --git a/meta/packages/gcc/gcc-cross-initial_3.4.3.bb b/meta/packages/gcc/gcc-cross-initial_3.4.3.bb
index 389c8aa75b..1639511362 100644
--- a/meta/packages/gcc/gcc-cross-initial_3.4.3.bb
+++ b/meta/packages/gcc/gcc-cross-initial_3.4.3.bb
@@ -1,27 +1,2 @@
 require gcc-cross_${PV}.bb
-
-DEPENDS = "virtual/${TARGET_PREFIX}binutils"
-DEPENDS += "${@['virtual/${TARGET_PREFIX}libc-initial',''][bb.data.getVar('TARGET_ARCH', d, 1) in ['arm', 'armeb', 'mips', 'mipsel']]}"
-PROVIDES = "virtual/${TARGET_PREFIX}gcc-initial"
-PACKAGES = ""
-
-# This is intended to be a -very- basic config
-EXTRA_OECONF = "--with-local-prefix=${CROSS_DIR}/${TARGET_SYS} \
-		--with-newlib \
-		--disable-shared \
-		--disable-threads \
-		--disable-multilib \
-		--disable-__cxa_atexit \
-		--enable-languages=c \
-		--enable-target-optspace \
-		--program-prefix=${TARGET_PREFIX} \
-		${@get_gcc_fpu_setting(bb, d)}"
-
-do_stage_prepend () {
-	mkdir -p ${CROSS_DIR}/lib/gcc/${TARGET_SYS}/${BINV}
-	ln -sf libgcc.a ${CROSS_DIR}/lib/gcc/${TARGET_SYS}/${BINV}/libgcc_eh.a
-}
-
-do_install () {
-	:
-}
+require gcc-cross-initial.inc
diff --git a/meta/packages/gcc/gcc-cross-initial_3.4.4.bb b/meta/packages/gcc/gcc-cross-initial_3.4.4.bb
index 389c8aa75b..1639511362 100644
--- a/meta/packages/gcc/gcc-cross-initial_3.4.4.bb
+++ b/meta/packages/gcc/gcc-cross-initial_3.4.4.bb
@@ -1,27 +1,2 @@
 require gcc-cross_${PV}.bb
-
-DEPENDS = "virtual/${TARGET_PREFIX}binutils"
-DEPENDS += "${@['virtual/${TARGET_PREFIX}libc-initial',''][bb.data.getVar('TARGET_ARCH', d, 1) in ['arm', 'armeb', 'mips', 'mipsel']]}"
-PROVIDES = "virtual/${TARGET_PREFIX}gcc-initial"
-PACKAGES = ""
-
-# This is intended to be a -very- basic config
-EXTRA_OECONF = "--with-local-prefix=${CROSS_DIR}/${TARGET_SYS} \
-		--with-newlib \
-		--disable-shared \
-		--disable-threads \
-		--disable-multilib \
-		--disable-__cxa_atexit \
-		--enable-languages=c \
-		--enable-target-optspace \
-		--program-prefix=${TARGET_PREFIX} \
-		${@get_gcc_fpu_setting(bb, d)}"
-
-do_stage_prepend () {
-	mkdir -p ${CROSS_DIR}/lib/gcc/${TARGET_SYS}/${BINV}
-	ln -sf libgcc.a ${CROSS_DIR}/lib/gcc/${TARGET_SYS}/${BINV}/libgcc_eh.a
-}
-
-do_install () {
-	:
-}
+require gcc-cross-initial.inc
diff --git a/meta/packages/gcc/gcc-cross-initial_4.0.2.bb b/meta/packages/gcc/gcc-cross-initial_4.0.2.bb
index 9d279d3ded..70877fe626 100644
--- a/meta/packages/gcc/gcc-cross-initial_4.0.2.bb
+++ b/meta/packages/gcc/gcc-cross-initial_4.0.2.bb
@@ -1,28 +1,4 @@
 require gcc-cross_${PV}.bb
+require gcc-cross-initial.inc
 
-DEPENDS = "virtual/${TARGET_PREFIX}binutils"
-DEPENDS += "${@['virtual/${TARGET_PREFIX}libc-initial',''][bb.data.getVar('TARGET_ARCH', d, 1) in ['arm', 'armeb', 'mips', 'mipsel']]}"
-PROVIDES = "virtual/${TARGET_PREFIX}gcc-initial"
-PACKAGES = ""
-
-# This is intended to be a -very- basic config
-EXTRA_OECONF = "--with-local-prefix=${CROSS_DIR}/${TARGET_SYS} \
-		--with-newlib \
-		--disable-shared \
-		--disable-threads \
-		--disable-multilib \
-		--disable-__cxa_atexit \
-                --disable-libmudflap \
-		--enable-languages=c \
-		--enable-target-optspace \
-		--program-prefix=${TARGET_PREFIX} \
-		${@get_gcc_fpu_setting(bb, d)}"
-
-do_stage_prepend () {
-	mkdir -p ${CROSS_DIR}/lib/gcc/${TARGET_SYS}/${BINV}
-	ln -sf libgcc.a ${CROSS_DIR}/lib/gcc/${TARGET_SYS}/${BINV}/libgcc_eh.a
-}
-
-do_install () {
-	:
-}
+EXTRA_OECONF += "--disable-multilib"
diff --git a/meta/packages/gcc/gcc-cross-initial_4.1.1.bb b/meta/packages/gcc/gcc-cross-initial_4.1.1.bb
index ade74d5e9b..1c1d094382 100644
--- a/meta/packages/gcc/gcc-cross-initial_4.1.1.bb
+++ b/meta/packages/gcc/gcc-cross-initial_4.1.1.bb
@@ -1,29 +1,5 @@
 require gcc-cross_${PV}.bb
+require gcc-cross-initial.inc
 
-DEPENDS = "virtual/${TARGET_PREFIX}binutils"
-DEPENDS += "${@['virtual/${TARGET_PREFIX}libc-initial',''][bb.data.getVar('TARGET_ARCH', d, 1) in ['arm', 'armeb', 'mips', 'mipsel']]}"
-PROVIDES = "virtual/${TARGET_PREFIX}gcc-initial"
-PACKAGES = ""
-
-# This is intended to be a -very- basic config
-EXTRA_OECONF = "--with-local-prefix=${CROSS_DIR}/${TARGET_SYS} \
-		--with-newlib \
-		--disable-shared \
-		--disable-threads \
-		--disable-multilib \
-		--disable-__cxa_atexit \
-		--disable-libmudflap \
-		--disable-libssp \
-		--enable-languages=c \
-		--enable-target-optspace \
-		--program-prefix=${TARGET_PREFIX} \
-		${@get_gcc_fpu_setting(bb, d)}"
-
-do_stage_prepend () {
-	mkdir -p ${CROSS_DIR}/lib/gcc/${TARGET_SYS}/${BINV}
-	ln -sf libgcc.a ${CROSS_DIR}/lib/gcc/${TARGET_SYS}/${BINV}/libgcc_eh.a
-}
-
-do_install () {
-	:
-}
+EXTRA_OECONF += "--disable-libmudflap \
+		--disable-libssp"
diff --git a/meta/packages/gcc/gcc-cross-initial_csl-arm-2005q3.bb b/meta/packages/gcc/gcc-cross-initial_csl-arm-2005q3.bb
index 389c8aa75b..1639511362 100644
--- a/meta/packages/gcc/gcc-cross-initial_csl-arm-2005q3.bb
+++ b/meta/packages/gcc/gcc-cross-initial_csl-arm-2005q3.bb
@@ -1,27 +1,2 @@
 require gcc-cross_${PV}.bb
-
-DEPENDS = "virtual/${TARGET_PREFIX}binutils"
-DEPENDS += "${@['virtual/${TARGET_PREFIX}libc-initial',''][bb.data.getVar('TARGET_ARCH', d, 1) in ['arm', 'armeb', 'mips', 'mipsel']]}"
-PROVIDES = "virtual/${TARGET_PREFIX}gcc-initial"
-PACKAGES = ""
-
-# This is intended to be a -very- basic config
-EXTRA_OECONF = "--with-local-prefix=${CROSS_DIR}/${TARGET_SYS} \
-		--with-newlib \
-		--disable-shared \
-		--disable-threads \
-		--disable-multilib \
-		--disable-__cxa_atexit \
-		--enable-languages=c \
-		--enable-target-optspace \
-		--program-prefix=${TARGET_PREFIX} \
-		${@get_gcc_fpu_setting(bb, d)}"
-
-do_stage_prepend () {
-	mkdir -p ${CROSS_DIR}/lib/gcc/${TARGET_SYS}/${BINV}
-	ln -sf libgcc.a ${CROSS_DIR}/lib/gcc/${TARGET_SYS}/${BINV}/libgcc_eh.a
-}
-
-do_install () {
-	:
-}
+require gcc-cross-initial.inc
diff --git a/meta/packages/gcc/gcc-cross-initial_csl-arm-2006q1.bb b/meta/packages/gcc/gcc-cross-initial_csl-arm-2006q1.bb
index 27b770fdce..0a8ed3f538 100644
--- a/meta/packages/gcc/gcc-cross-initial_csl-arm-2006q1.bb
+++ b/meta/packages/gcc/gcc-cross-initial_csl-arm-2006q1.bb
@@ -1,31 +1,7 @@
 require gcc-cross_${PV}.bb
-
-DEPENDS = "virtual/${TARGET_PREFIX}binutils"
-DEPENDS += "${@['virtual/${TARGET_PREFIX}libc-initial',''][bb.data.getVar('TARGET_ARCH', d, 1) in ['arm', 'armeb', 'mips', 'mipsel']]}"
-PROVIDES = "virtual/${TARGET_PREFIX}gcc-initial"
-PACKAGES = ""
+require gcc-cross-initial.inc
 
 S = "${WORKDIR}/gcc-2006q1"
 
-# This is intended to be a -very- basic config
-EXTRA_OECONF = "--with-local-prefix=${CROSS_DIR}/${TARGET_SYS} \
-		--with-newlib \
-		--disable-shared \
-		--disable-threads \
-		--disable-multilib \
-		--disable-__cxa_atexit \
-		--disable-libmudflap \
-		--disable-libssp \
-		--enable-languages=c \
-		--enable-target-optspace \
-		--program-prefix=${TARGET_PREFIX} \
-		${@get_gcc_fpu_setting(bb, d)}"
-
-do_stage_prepend () {
-	mkdir -p ${CROSS_DIR}/lib/gcc/${TARGET_SYS}/${BINV}
-	ln -sf libgcc.a ${CROSS_DIR}/lib/gcc/${TARGET_SYS}/${BINV}/libgcc_eh.a
-}
-
-do_install () {
-	:
-}
+EXTRA_OECONF = "--disable-libmudflap \
+		--disable-libssp"