gcc: Move -native dependencies into the base gcc version configuration file and create and use EXTRA_OECONF_INITIAL and EXTRA_OECONF_INTERMEDIATE variables

Signed-off-by: Richard Purdie <rpurdie@linux.intel.com>
This commit is contained in:
Richard Purdie 2010-03-31 12:09:14 +01:00
parent 5b5a069e16
commit fb5b562837
12 changed files with 13 additions and 25 deletions

View File

@ -1,6 +1,7 @@
require gcc-common.inc
DEPENDS =+ "mpfr gmp"
NATIVEDEPS = "mpfr-native gmp-native"
SRC_URI = "ftp://ftp.gnu.org/pub/gnu/gcc/gcc-${PV}/gcc-${PV}.tar.bz2 \
file://100-uclibc-conf.patch;patch=1 \
@ -68,5 +69,7 @@ FORTRAN_linux-gnueabi = ",fortran"
JAVA = ""
EXTRA_OECONF_BASE += " --disable-libssp --disable-bootstrap --disable-libgomp --disable-libmudflap"
EXTRA_OECONF_INITIAL = "--disable-libmudflap --disable-libgomp --disable-libssp"
EXTRA_OECONF_INTERMEDIATE = "--disable-libmudflap --disable-libgomp --disable-libssp"
ARM_INSTRUCTION_SET = "arm"

View File

@ -2,6 +2,7 @@ require gcc-common.inc
LICENSE = "GPLv3"
DEPENDS =+ "mpfr gmp"
NATIVEDEPS = "mpfr-native gmp-native"
SRC_URI = "${GNU_MIRROR}/gcc/gcc-${PV}/gcc-${PV}.tar.bz2 \
file://fedora/gcc43-c++-builtin-redecl.patch;patch=1;pnum=0 \
@ -61,4 +62,5 @@ FORTRAN = ""
JAVA = ""
EXTRA_OECONF_BASE = " --enable-cheaders=c_std --enable-libssp --disable-bootstrap --disable-libgomp --disable-libmudflap"
EXTRA_OECONF_INITIAL = "--disable-libmudflap --disable-libgomp --disable-libssp --enable-decimal-float=no"
EXTRA_OECONF_INTERMEDIATE = "--disable-libmudflap --disable-libgomp --disable-libssp"

View File

@ -3,6 +3,8 @@ HOMEPAGE = "http://www.gnu.org/software/gcc/"
SECTION = "devel"
LICENSE = "GPL"
NATIVEDEPS = ""
inherit autotools gettext
FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/gcc-${PV}"

View File

@ -1,4 +1,4 @@
DEPENDS = "virtual/${TARGET_PREFIX}binutils gettext-native"
DEPENDS = "virtual/${TARGET_PREFIX}binutils gettext-native ${NATIVEDEPS}"
PROVIDES = "virtual/${TARGET_PREFIX}gcc-initial"
PACKAGES = ""

View File

@ -1,5 +1,2 @@
require gcc-cross_${PV}.bb
require gcc-cross-initial.inc
EXTRA_OECONF += "--disable-libmudflap --disable-libgomp \
--disable-libssp"

View File

@ -3,13 +3,6 @@ require gcc-cross-initial.inc
PR = "r1"
DEPENDS += "gmp-native mpfr-native"
EXTRA_OECONF += " --disable-libmudflap \
--disable-decimal-float \
--disable-libgomp \
--disable-libssp"
# Hack till we fix *libc properly
do_install_append() {
ln -sf ${CROSS_DIR}/lib/gcc/${TARGET_SYS}/${BINV}/include-fixed/* ${D}${CROSS_DIR}/lib/gcc/${TARGET_SYS}/${BINV}/include/

View File

@ -3,8 +3,6 @@ require gcc-cross-initial.inc
S = "${WORKDIR}/gcc-4.2"
EXTRA_OECONF += "--disable-libssp --disable-bootstrap --disable-libgomp --disable-libmudflap "
# Hack till we fix *libc properly
do_install_append() {
ln -sf ${CROSS_DIR}/lib/gcc/${TARGET_SYS}/${BINV}/include-fixed/* ${D}${CROSS_DIR}/lib/gcc/${TARGET_SYS}/${BINV}/include/

View File

@ -1,4 +1,4 @@
DEPENDS = "virtual/${TARGET_PREFIX}binutils"
DEPENDS = "virtual/${TARGET_PREFIX}binutils ${NATIVEDEPS}"
DEPENDS += "virtual/${TARGET_PREFIX}libc-initial gettext-native"
PROVIDES = "virtual/${TARGET_PREFIX}gcc-intermediate"
PACKAGES = ""

View File

@ -1,5 +1,2 @@
require gcc-cross_${PV}.bb
require gcc-cross-intermediate.inc
EXTRA_OECONF += "--disable-libmudflap --disable-libgomp \
--disable-libssp"

View File

@ -1,11 +1,6 @@
require gcc-cross_${PV}.bb
require gcc-cross-intermediate.inc
PR = "r1"
DEPENDS += "gmp-native mpfr-native"
EXTRA_OECONF += " --disable-libmudflap \
--disable-libgomp \
--disable-libssp"
# Hack till we fix *libc properly
do_install_append() {

View File

@ -3,8 +3,6 @@ require gcc-cross-intermediate.inc
S = "${WORKDIR}/gcc-4.2"
EXTRA_OECONF += "--disable-libssp --disable-bootstrap --disable-libgomp --disable-libmudflap "
# Hack till we fix *libc properly
do_install_append() {
ln -sf ${CROSS_DIR}/lib/gcc/${TARGET_SYS}/${BINV}/include-fixed/* ${D}${CROSS_DIR}/lib/gcc/${TARGET_SYS}/${BINV}/include/

View File

@ -45,6 +45,9 @@ FORTRAN = ""
#JAVA = ",java"
EXTRA_OECONF_BASE = "--enable-libssp --disable-bootstrap --disable-libgomp --disable-libmudflap"
EXTRA_OECONF_INITIAL = "--disable-libmudflap --disable-libgomp --disable-libssp --disable-bootstrap"
EXTRA_OECONF_INTERMEDIATE = "--disable-libmudflap --disable-libgomp --disable-libssp --disable-bootstrap"
ARM_INSTRUCTION_SET = "arm"
addtask unpack2 after do_unpack before do_patch