summaryrefslogtreecommitdiffstats
path: root/meta/packages/gcc
diff options
context:
space:
mode:
authorRichard Purdie <rpurdie@linux.intel.com>2010-03-31 12:09:14 +0100
committerRichard Purdie <rpurdie@linux.intel.com>2010-03-31 12:09:14 +0100
commitfb5b56283760444cfa3ca495f0831652446327ba (patch)
tree4be4c91142bb0b3872aa98f964f68a495de273c6 /meta/packages/gcc
parent5b5a069e16bc64e4add040d191066ff551d396e9 (diff)
downloadpoky-fb5b56283760444cfa3ca495f0831652446327ba.tar.gz
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>
Diffstat (limited to 'meta/packages/gcc')
-rw-r--r--meta/packages/gcc/gcc-4.2.3.inc3
-rw-r--r--meta/packages/gcc/gcc-4.3.3.inc4
-rw-r--r--meta/packages/gcc/gcc-common.inc2
-rw-r--r--meta/packages/gcc/gcc-cross-initial.inc2
-rw-r--r--meta/packages/gcc/gcc-cross-initial_4.2.3.bb3
-rw-r--r--meta/packages/gcc/gcc-cross-initial_4.3.3.bb7
-rw-r--r--meta/packages/gcc/gcc-cross-initial_csl-arm-2008q1.bb2
-rw-r--r--meta/packages/gcc/gcc-cross-intermediate.inc2
-rw-r--r--meta/packages/gcc/gcc-cross-intermediate_4.2.3.bb3
-rw-r--r--meta/packages/gcc/gcc-cross-intermediate_4.3.3.bb5
-rw-r--r--meta/packages/gcc/gcc-cross-intermediate_csl-arm-2008q1.bb2
-rw-r--r--meta/packages/gcc/gcc-csl-arm-2008q1.inc3
12 files changed, 13 insertions, 25 deletions
diff --git a/meta/packages/gcc/gcc-4.2.3.inc b/meta/packages/gcc/gcc-4.2.3.inc
index d4d339b052..f8da4efeda 100644
--- a/meta/packages/gcc/gcc-4.2.3.inc
+++ b/meta/packages/gcc/gcc-4.2.3.inc
@@ -1,6 +1,7 @@
1require gcc-common.inc 1require gcc-common.inc
2 2
3DEPENDS =+ "mpfr gmp" 3DEPENDS =+ "mpfr gmp"
4NATIVEDEPS = "mpfr-native gmp-native"
4 5
5SRC_URI = "ftp://ftp.gnu.org/pub/gnu/gcc/gcc-${PV}/gcc-${PV}.tar.bz2 \ 6SRC_URI = "ftp://ftp.gnu.org/pub/gnu/gcc/gcc-${PV}/gcc-${PV}.tar.bz2 \
6 file://100-uclibc-conf.patch;patch=1 \ 7 file://100-uclibc-conf.patch;patch=1 \
@@ -68,5 +69,7 @@ FORTRAN_linux-gnueabi = ",fortran"
68JAVA = "" 69JAVA = ""
69 70
70EXTRA_OECONF_BASE += " --disable-libssp --disable-bootstrap --disable-libgomp --disable-libmudflap" 71EXTRA_OECONF_BASE += " --disable-libssp --disable-bootstrap --disable-libgomp --disable-libmudflap"
72EXTRA_OECONF_INITIAL = "--disable-libmudflap --disable-libgomp --disable-libssp"
73EXTRA_OECONF_INTERMEDIATE = "--disable-libmudflap --disable-libgomp --disable-libssp"
71 74
72ARM_INSTRUCTION_SET = "arm" 75ARM_INSTRUCTION_SET = "arm"
diff --git a/meta/packages/gcc/gcc-4.3.3.inc b/meta/packages/gcc/gcc-4.3.3.inc
index 06f26274d0..0f7aa880d3 100644
--- a/meta/packages/gcc/gcc-4.3.3.inc
+++ b/meta/packages/gcc/gcc-4.3.3.inc
@@ -2,6 +2,7 @@ require gcc-common.inc
2LICENSE = "GPLv3" 2LICENSE = "GPLv3"
3 3
4DEPENDS =+ "mpfr gmp" 4DEPENDS =+ "mpfr gmp"
5NATIVEDEPS = "mpfr-native gmp-native"
5 6
6SRC_URI = "${GNU_MIRROR}/gcc/gcc-${PV}/gcc-${PV}.tar.bz2 \ 7SRC_URI = "${GNU_MIRROR}/gcc/gcc-${PV}/gcc-${PV}.tar.bz2 \
7 file://fedora/gcc43-c++-builtin-redecl.patch;patch=1;pnum=0 \ 8 file://fedora/gcc43-c++-builtin-redecl.patch;patch=1;pnum=0 \
@@ -61,4 +62,5 @@ FORTRAN = ""
61JAVA = "" 62JAVA = ""
62 63
63EXTRA_OECONF_BASE = " --enable-cheaders=c_std --enable-libssp --disable-bootstrap --disable-libgomp --disable-libmudflap" 64EXTRA_OECONF_BASE = " --enable-cheaders=c_std --enable-libssp --disable-bootstrap --disable-libgomp --disable-libmudflap"
64 65EXTRA_OECONF_INITIAL = "--disable-libmudflap --disable-libgomp --disable-libssp --enable-decimal-float=no"
66EXTRA_OECONF_INTERMEDIATE = "--disable-libmudflap --disable-libgomp --disable-libssp"
diff --git a/meta/packages/gcc/gcc-common.inc b/meta/packages/gcc/gcc-common.inc
index c482826aa0..ea0a48ea0c 100644
--- a/meta/packages/gcc/gcc-common.inc
+++ b/meta/packages/gcc/gcc-common.inc
@@ -3,6 +3,8 @@ HOMEPAGE = "http://www.gnu.org/software/gcc/"
3SECTION = "devel" 3SECTION = "devel"
4LICENSE = "GPL" 4LICENSE = "GPL"
5 5
6NATIVEDEPS = ""
7
6inherit autotools gettext 8inherit autotools gettext
7 9
8FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/gcc-${PV}" 10FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/gcc-${PV}"
diff --git a/meta/packages/gcc/gcc-cross-initial.inc b/meta/packages/gcc/gcc-cross-initial.inc
index a3545417ce..124b323810 100644
--- a/meta/packages/gcc/gcc-cross-initial.inc
+++ b/meta/packages/gcc/gcc-cross-initial.inc
@@ -1,4 +1,4 @@
1DEPENDS = "virtual/${TARGET_PREFIX}binutils gettext-native" 1DEPENDS = "virtual/${TARGET_PREFIX}binutils gettext-native ${NATIVEDEPS}"
2PROVIDES = "virtual/${TARGET_PREFIX}gcc-initial" 2PROVIDES = "virtual/${TARGET_PREFIX}gcc-initial"
3PACKAGES = "" 3PACKAGES = ""
4 4
diff --git a/meta/packages/gcc/gcc-cross-initial_4.2.3.bb b/meta/packages/gcc/gcc-cross-initial_4.2.3.bb
index fe326d304b..1639511362 100644
--- a/meta/packages/gcc/gcc-cross-initial_4.2.3.bb
+++ b/meta/packages/gcc/gcc-cross-initial_4.2.3.bb
@@ -1,5 +1,2 @@
1require gcc-cross_${PV}.bb 1require gcc-cross_${PV}.bb
2require gcc-cross-initial.inc 2require gcc-cross-initial.inc
3
4EXTRA_OECONF += "--disable-libmudflap --disable-libgomp \
5 --disable-libssp"
diff --git a/meta/packages/gcc/gcc-cross-initial_4.3.3.bb b/meta/packages/gcc/gcc-cross-initial_4.3.3.bb
index a06398389e..8a429d54fe 100644
--- a/meta/packages/gcc/gcc-cross-initial_4.3.3.bb
+++ b/meta/packages/gcc/gcc-cross-initial_4.3.3.bb
@@ -3,13 +3,6 @@ require gcc-cross-initial.inc
3 3
4PR = "r1" 4PR = "r1"
5 5
6DEPENDS += "gmp-native mpfr-native"
7
8EXTRA_OECONF += " --disable-libmudflap \
9 --disable-decimal-float \
10 --disable-libgomp \
11 --disable-libssp"
12
13# Hack till we fix *libc properly 6# Hack till we fix *libc properly
14do_install_append() { 7do_install_append() {
15 ln -sf ${CROSS_DIR}/lib/gcc/${TARGET_SYS}/${BINV}/include-fixed/* ${D}${CROSS_DIR}/lib/gcc/${TARGET_SYS}/${BINV}/include/ 8 ln -sf ${CROSS_DIR}/lib/gcc/${TARGET_SYS}/${BINV}/include-fixed/* ${D}${CROSS_DIR}/lib/gcc/${TARGET_SYS}/${BINV}/include/
diff --git a/meta/packages/gcc/gcc-cross-initial_csl-arm-2008q1.bb b/meta/packages/gcc/gcc-cross-initial_csl-arm-2008q1.bb
index 1a921d2d9c..a3664710f1 100644
--- a/meta/packages/gcc/gcc-cross-initial_csl-arm-2008q1.bb
+++ b/meta/packages/gcc/gcc-cross-initial_csl-arm-2008q1.bb
@@ -3,8 +3,6 @@ require gcc-cross-initial.inc
3 3
4S = "${WORKDIR}/gcc-4.2" 4S = "${WORKDIR}/gcc-4.2"
5 5
6EXTRA_OECONF += "--disable-libssp --disable-bootstrap --disable-libgomp --disable-libmudflap "
7
8# Hack till we fix *libc properly 6# Hack till we fix *libc properly
9do_install_append() { 7do_install_append() {
10 ln -sf ${CROSS_DIR}/lib/gcc/${TARGET_SYS}/${BINV}/include-fixed/* ${D}${CROSS_DIR}/lib/gcc/${TARGET_SYS}/${BINV}/include/ 8 ln -sf ${CROSS_DIR}/lib/gcc/${TARGET_SYS}/${BINV}/include-fixed/* ${D}${CROSS_DIR}/lib/gcc/${TARGET_SYS}/${BINV}/include/
diff --git a/meta/packages/gcc/gcc-cross-intermediate.inc b/meta/packages/gcc/gcc-cross-intermediate.inc
index 169419f247..749bd36df4 100644
--- a/meta/packages/gcc/gcc-cross-intermediate.inc
+++ b/meta/packages/gcc/gcc-cross-intermediate.inc
@@ -1,4 +1,4 @@
1DEPENDS = "virtual/${TARGET_PREFIX}binutils" 1DEPENDS = "virtual/${TARGET_PREFIX}binutils ${NATIVEDEPS}"
2DEPENDS += "virtual/${TARGET_PREFIX}libc-initial gettext-native" 2DEPENDS += "virtual/${TARGET_PREFIX}libc-initial gettext-native"
3PROVIDES = "virtual/${TARGET_PREFIX}gcc-intermediate" 3PROVIDES = "virtual/${TARGET_PREFIX}gcc-intermediate"
4PACKAGES = "" 4PACKAGES = ""
diff --git a/meta/packages/gcc/gcc-cross-intermediate_4.2.3.bb b/meta/packages/gcc/gcc-cross-intermediate_4.2.3.bb
index 7acca81c3b..eb59de9461 100644
--- a/meta/packages/gcc/gcc-cross-intermediate_4.2.3.bb
+++ b/meta/packages/gcc/gcc-cross-intermediate_4.2.3.bb
@@ -1,5 +1,2 @@
1require gcc-cross_${PV}.bb 1require gcc-cross_${PV}.bb
2require gcc-cross-intermediate.inc 2require gcc-cross-intermediate.inc
3
4EXTRA_OECONF += "--disable-libmudflap --disable-libgomp \
5 --disable-libssp"
diff --git a/meta/packages/gcc/gcc-cross-intermediate_4.3.3.bb b/meta/packages/gcc/gcc-cross-intermediate_4.3.3.bb
index 3969dba32d..6de46f7e27 100644
--- a/meta/packages/gcc/gcc-cross-intermediate_4.3.3.bb
+++ b/meta/packages/gcc/gcc-cross-intermediate_4.3.3.bb
@@ -1,11 +1,6 @@
1require gcc-cross_${PV}.bb 1require gcc-cross_${PV}.bb
2require gcc-cross-intermediate.inc 2require gcc-cross-intermediate.inc
3PR = "r1" 3PR = "r1"
4DEPENDS += "gmp-native mpfr-native"
5
6EXTRA_OECONF += " --disable-libmudflap \
7 --disable-libgomp \
8 --disable-libssp"
9 4
10# Hack till we fix *libc properly 5# Hack till we fix *libc properly
11do_install_append() { 6do_install_append() {
diff --git a/meta/packages/gcc/gcc-cross-intermediate_csl-arm-2008q1.bb b/meta/packages/gcc/gcc-cross-intermediate_csl-arm-2008q1.bb
index 0dabd0b8db..b6d3a3a642 100644
--- a/meta/packages/gcc/gcc-cross-intermediate_csl-arm-2008q1.bb
+++ b/meta/packages/gcc/gcc-cross-intermediate_csl-arm-2008q1.bb
@@ -3,8 +3,6 @@ require gcc-cross-intermediate.inc
3 3
4S = "${WORKDIR}/gcc-4.2" 4S = "${WORKDIR}/gcc-4.2"
5 5
6EXTRA_OECONF += "--disable-libssp --disable-bootstrap --disable-libgomp --disable-libmudflap "
7
8# Hack till we fix *libc properly 6# Hack till we fix *libc properly
9do_install_append() { 7do_install_append() {
10 ln -sf ${CROSS_DIR}/lib/gcc/${TARGET_SYS}/${BINV}/include-fixed/* ${D}${CROSS_DIR}/lib/gcc/${TARGET_SYS}/${BINV}/include/ 8 ln -sf ${CROSS_DIR}/lib/gcc/${TARGET_SYS}/${BINV}/include-fixed/* ${D}${CROSS_DIR}/lib/gcc/${TARGET_SYS}/${BINV}/include/
diff --git a/meta/packages/gcc/gcc-csl-arm-2008q1.inc b/meta/packages/gcc/gcc-csl-arm-2008q1.inc
index d4f6ef1e37..e84bd835d2 100644
--- a/meta/packages/gcc/gcc-csl-arm-2008q1.inc
+++ b/meta/packages/gcc/gcc-csl-arm-2008q1.inc
@@ -45,6 +45,9 @@ FORTRAN = ""
45#JAVA = ",java" 45#JAVA = ",java"
46 46
47EXTRA_OECONF_BASE = "--enable-libssp --disable-bootstrap --disable-libgomp --disable-libmudflap" 47EXTRA_OECONF_BASE = "--enable-libssp --disable-bootstrap --disable-libgomp --disable-libmudflap"
48EXTRA_OECONF_INITIAL = "--disable-libmudflap --disable-libgomp --disable-libssp --disable-bootstrap"
49EXTRA_OECONF_INTERMEDIATE = "--disable-libmudflap --disable-libgomp --disable-libssp --disable-bootstrap"
50
48ARM_INSTRUCTION_SET = "arm" 51ARM_INSTRUCTION_SET = "arm"
49 52
50addtask unpack2 after do_unpack before do_patch 53addtask unpack2 after do_unpack before do_patch