gcc-cross-initial: Factor common code into an inc file, don't run make install for...

diff --git a/packages/gcc/gcc-cross-initial_3.3.4.bb b/packages/gcc/gcc-cross-initial_3.3.4.bb
index 4fccaf3..1639511 100644 (file)
--- a/packages/gcc/gcc-cross-initial_3.3.4.bb
+++ b/packages/gcc/gcc-cross-initial_3.3.4.bb
@@ -1,29 +1,2 @@
-SECTION = "devel"
 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
-}
-
-# Override the method from gcc-cross so we don't try to install libgcc
-do_install () {
-       oe_runmake 'DESTDIR=${D}' install
-}
+require gcc-cross-initial.inc

diff --git a/packages/gcc/gcc-cross-initial_3.4.3.bb b/packages/gcc/gcc-cross-initial_3.4.3.bb
index 307c6f7..1639511 100644 (file)
--- a/packages/gcc/gcc-cross-initial_3.4.3.bb
+++ b/packages/gcc/gcc-cross-initial_3.4.3.bb
@@ -1,28 +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
-}
-
-# Override the method from gcc-cross so we don't try to install libgcc
-do_install () {
-       oe_runmake 'DESTDIR=${D}' install
-}
+require gcc-cross-initial.inc

diff --git a/packages/gcc/gcc-cross-initial_3.4.4.bb b/packages/gcc/gcc-cross-initial_3.4.4.bb
index 307c6f7..1639511 100644 (file)
--- a/packages/gcc/gcc-cross-initial_3.4.4.bb
+++ b/packages/gcc/gcc-cross-initial_3.4.4.bb
@@ -1,28 +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
-}
-
-# Override the method from gcc-cross so we don't try to install libgcc
-do_install () {
-       oe_runmake 'DESTDIR=${D}' install
-}
+require gcc-cross-initial.inc

diff --git a/packages/gcc/gcc-cross-initial_4.0.2.bb b/packages/gcc/gcc-cross-initial_4.0.2.bb
index 037f303..70877fe 100644 (file)
--- a/packages/gcc/gcc-cross-initial_4.0.2.bb
+++ b/packages/gcc/gcc-cross-initial_4.0.2.bb
@@ -1,29 +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
-}
-
-# Override the method from gcc-cross so we don't try to install libgcc
-do_install () {
-       oe_runmake 'DESTDIR=${D}' install
-}
+EXTRA_OECONF += "--disable-multilib"

diff --git a/packages/gcc/gcc-cross-initial_4.1.0.bb b/packages/gcc/gcc-cross-initial_4.1.0.bb
index 1e23ef9..1c1d094 100644 (file)
--- a/packages/gcc/gcc-cross-initial_4.1.0.bb
+++ b/packages/gcc/gcc-cross-initial_4.1.0.bb
@@ -1,30 +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
-}
-
-# Override the method from gcc-cross so we don't try to install libgcc
-do_install () {
-       oe_runmake 'DESTDIR=${D}' install
-}
+EXTRA_OECONF += "--disable-libmudflap \
+               --disable-libssp"

diff --git a/packages/gcc/gcc-cross-initial_4.1.1.bb b/packages/gcc/gcc-cross-initial_4.1.1.bb
index 1e23ef9..1c1d094 100644 (file)
--- a/packages/gcc/gcc-cross-initial_4.1.1.bb
+++ b/packages/gcc/gcc-cross-initial_4.1.1.bb
@@ -1,30 +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
-}
-
-# Override the method from gcc-cross so we don't try to install libgcc
-do_install () {
-       oe_runmake 'DESTDIR=${D}' install
-}
+EXTRA_OECONF += "--disable-libmudflap \
+               --disable-libssp"

diff --git a/packages/gcc/gcc-cross-initial_4.1.2.bb b/packages/gcc/gcc-cross-initial_4.1.2.bb
index 1e23ef9..1c1d094 100644 (file)
--- a/packages/gcc/gcc-cross-initial_4.1.2.bb
+++ b/packages/gcc/gcc-cross-initial_4.1.2.bb
@@ -1,30 +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
-}
-
-# Override the method from gcc-cross so we don't try to install libgcc
-do_install () {
-       oe_runmake 'DESTDIR=${D}' install
-}
+EXTRA_OECONF += "--disable-libmudflap \
+               --disable-libssp"

diff --git a/packages/gcc/gcc-cross-initial_4.2.1.bb b/packages/gcc/gcc-cross-initial_4.2.1.bb
index 1e23ef9..1c1d094 100644 (file)
--- a/packages/gcc/gcc-cross-initial_4.2.1.bb
+++ b/packages/gcc/gcc-cross-initial_4.2.1.bb
@@ -1,30 +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
-}
-
-# Override the method from gcc-cross so we don't try to install libgcc
-do_install () {
-       oe_runmake 'DESTDIR=${D}' install
-}
+EXTRA_OECONF += "--disable-libmudflap \
+               --disable-libssp"

diff --git a/packages/gcc/gcc-cross-initial_csl-arm-2005q3.bb b/packages/gcc/gcc-cross-initial_csl-arm-2005q3.bb
index 307c6f7..1639511 100644 (file)
--- a/packages/gcc/gcc-cross-initial_csl-arm-2005q3.bb
+++ b/packages/gcc/gcc-cross-initial_csl-arm-2005q3.bb
@@ -1,28 +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
-}
-
-# Override the method from gcc-cross so we don't try to install libgcc
-do_install () {
-       oe_runmake 'DESTDIR=${D}' install
-}
+require gcc-cross-initial.inc