summaryrefslogtreecommitdiffstats
path: root/meta/recipes-devtools
diff options
context:
space:
mode:
authorRichard Purdie <richard.purdie@linuxfoundation.org>2013-08-20 22:29:25 +0000
committerRichard Purdie <richard.purdie@linuxfoundation.org>2013-08-23 16:20:12 +0100
commita966f3017b1af8df515e19fdd3a39366ab4dc219 (patch)
tree49034b6ab883dd61c19763ed8512c5d010b7ada5 /meta/recipes-devtools
parent19950532859eefcce3ccf91ee880fd16f5d933ef (diff)
downloadpoky-a966f3017b1af8df515e19fdd3a39366ab4dc219.tar.gz
gcc-cross-canadian: Merge 4.7 and 4.8 recipes into common include
This removes duplication and follows the pattern of the other gcc recipes. (From OE-Core rev: 3296c896f5a5ef7dd50ab4e00ddbf1c2476462dc) Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-devtools')
-rw-r--r--meta/recipes-devtools/gcc/gcc-cross-canadian.inc19
-rw-r--r--meta/recipes-devtools/gcc/gcc-cross-canadian_4.7.bb23
-rw-r--r--meta/recipes-devtools/gcc/gcc-cross-canadian_4.8.bb20
3 files changed, 19 insertions, 43 deletions
diff --git a/meta/recipes-devtools/gcc/gcc-cross-canadian.inc b/meta/recipes-devtools/gcc/gcc-cross-canadian.inc
index 10ddacf7fa..85c3166424 100644
--- a/meta/recipes-devtools/gcc/gcc-cross-canadian.inc
+++ b/meta/recipes-devtools/gcc/gcc-cross-canadian.inc
@@ -7,3 +7,22 @@ BPN = "gcc"
7DEPENDS = "virtual/${TARGET_PREFIX}gcc virtual/${HOST_PREFIX}binutils-crosssdk virtual/nativesdk-${HOST_PREFIX}libc-for-gcc nativesdk-gettext" 7DEPENDS = "virtual/${TARGET_PREFIX}gcc virtual/${HOST_PREFIX}binutils-crosssdk virtual/nativesdk-${HOST_PREFIX}libc-for-gcc nativesdk-gettext"
8 8
9GCCMULTILIB = "--enable-multilib" 9GCCMULTILIB = "--enable-multilib"
10
11require gcc-configure-sdk.inc
12require gcc-package-sdk.inc
13
14ELFUTILS = "nativesdk-elfutils"
15DEPENDS += "nativesdk-gmp nativesdk-mpfr nativesdk-libmpc ${ELFUTILS} nativesdk-zlib"
16RDEPENDS_${PN} += "nativesdk-mpfr nativesdk-libmpc ${ELFUTILS}"
17
18SYSTEMHEADERS = "/usr/include"
19SYSTEMLIBS = "${target_base_libdir}/"
20SYSTEMLIBS1 = "${target_libdir}/"
21
22EXTRA_OECONF += "--disable-libunwind-exceptions --disable-libssp \
23 --disable-libgomp --disable-libmudflap \
24 --with-mpfr=${STAGING_DIR_HOST}${layout_exec_prefix} \
25 --with-mpc=${STAGING_DIR_HOST}${layout_exec_prefix}"
26
27# gcc 4.7 needs -isystem
28export ARCH_FLAGS_FOR_TARGET = "--sysroot=${STAGING_DIR_TARGET} -isystem=${target_includedir}"
diff --git a/meta/recipes-devtools/gcc/gcc-cross-canadian_4.7.bb b/meta/recipes-devtools/gcc/gcc-cross-canadian_4.7.bb
index 53c463264f..355757c656 100644
--- a/meta/recipes-devtools/gcc/gcc-cross-canadian_4.7.bb
+++ b/meta/recipes-devtools/gcc/gcc-cross-canadian_4.7.bb
@@ -1,26 +1,3 @@
1inherit cross-canadian
2
3require recipes-devtools/gcc/gcc-${PV}.inc 1require recipes-devtools/gcc/gcc-${PV}.inc
4require gcc-cross-canadian.inc 2require gcc-cross-canadian.inc
5require gcc-configure-sdk.inc
6require gcc-package-sdk.inc
7
8DEPENDS += "nativesdk-gmp nativesdk-mpfr nativesdk-libmpc nativesdk-elfutils"
9RDEPENDS_${PN} += "nativesdk-mpfr nativesdk-libmpc nativesdk-elfutils"
10
11SYSTEMHEADERS = "/usr/include"
12SYSTEMLIBS = "${target_base_libdir}/"
13SYSTEMLIBS1 = "${target_libdir}/"
14
15EXTRA_OECONF += "--disable-libunwind-exceptions --disable-libssp \
16 --disable-libgomp --disable-libmudflap \
17 --with-mpfr=${STAGING_DIR_HOST}${layout_exec_prefix} \
18 --with-mpc=${STAGING_DIR_HOST}${layout_exec_prefix}"
19
20# to find libmpfr
21# export LD_LIBRARY_PATH = "{STAGING_DIR_HOST}${layout_exec_prefix}"
22
23PARALLEL_MAKE = ""
24 3
25# gcc 4.7 needs -isystem
26export ARCH_FLAGS_FOR_TARGET = "--sysroot=${STAGING_DIR_TARGET} -isystem=${target_includedir}"
diff --git a/meta/recipes-devtools/gcc/gcc-cross-canadian_4.8.bb b/meta/recipes-devtools/gcc/gcc-cross-canadian_4.8.bb
index bf49c3d0bb..bf53c5cd78 100644
--- a/meta/recipes-devtools/gcc/gcc-cross-canadian_4.8.bb
+++ b/meta/recipes-devtools/gcc/gcc-cross-canadian_4.8.bb
@@ -1,25 +1,5 @@
1inherit cross-canadian
2
3require recipes-devtools/gcc/gcc-${PV}.inc 1require recipes-devtools/gcc/gcc-${PV}.inc
4require gcc-cross-canadian.inc 2require gcc-cross-canadian.inc
5require gcc-configure-sdk.inc
6require gcc-package-sdk.inc
7
8ELFUTILS = "nativesdk-elfutils"
9DEPENDS += "nativesdk-gmp nativesdk-mpfr nativesdk-libmpc ${ELFUTILS} nativesdk-zlib"
10RDEPENDS_${PN} += "nativesdk-mpfr nativesdk-libmpc ${ELFUTILS}"
11
12SYSTEMHEADERS = "/usr/include"
13SYSTEMLIBS = "${target_base_libdir}/"
14SYSTEMLIBS1 = "${target_libdir}/"
15 3
16EXTRA_OECONF += "--disable-libunwind-exceptions --disable-libssp \
17 --disable-libgomp --disable-libmudflap \
18 --with-mpfr=${STAGING_DIR_HOST}${layout_exec_prefix} \
19 --with-mpc=${STAGING_DIR_HOST}${layout_exec_prefix}"
20 4
21# to find libmpfr
22# export LD_LIBRARY_PATH = "{STAGING_DIR_HOST}${layout_exec_prefix}"
23 5
24# gcc 4.7 needs -isystem
25export ARCH_FLAGS_FOR_TARGET = "--sysroot=${STAGING_DIR_TARGET} -isystem=${target_includedir}"