diff options
| author | Richard Purdie <richard.purdie@linuxfoundation.org> | 2013-08-20 22:29:25 +0000 |
|---|---|---|
| committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2013-08-22 18:30:06 +0100 |
| commit | 3296c896f5a5ef7dd50ab4e00ddbf1c2476462dc (patch) | |
| tree | 56be756f4f3315bdc3781594b415e1fc4ac5db50 | |
| parent | c782bd4de511b6e603a72a00124a77be52e50dce (diff) | |
| download | openembedded-core-3296c896f5a5ef7dd50ab4e00ddbf1c2476462dc.tar.gz openembedded-core-3296c896f5a5ef7dd50ab4e00ddbf1c2476462dc.tar.bz2 openembedded-core-3296c896f5a5ef7dd50ab4e00ddbf1c2476462dc.zip | |
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.
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
| -rw-r--r-- | meta/recipes-devtools/gcc/gcc-cross-canadian.inc | 19 | ||||
| -rw-r--r-- | meta/recipes-devtools/gcc/gcc-cross-canadian_4.7.bb | 23 | ||||
| -rw-r--r-- | meta/recipes-devtools/gcc/gcc-cross-canadian_4.8.bb | 20 |
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" DEPENDS = "virtual/${TARGET_PREFIX}gcc virtual/${HOST_PREFIX}binutils-crosssdk virtual/nativesdk-${HOST_PREFIX}libc-for-gcc nativesdk-gettext" GCCMULTILIB = "--enable-multilib" + +require gcc-configure-sdk.inc +require gcc-package-sdk.inc + +ELFUTILS = "nativesdk-elfutils" +DEPENDS += "nativesdk-gmp nativesdk-mpfr nativesdk-libmpc ${ELFUTILS} nativesdk-zlib" +RDEPENDS_${PN} += "nativesdk-mpfr nativesdk-libmpc ${ELFUTILS}" + +SYSTEMHEADERS = "/usr/include" +SYSTEMLIBS = "${target_base_libdir}/" +SYSTEMLIBS1 = "${target_libdir}/" + +EXTRA_OECONF += "--disable-libunwind-exceptions --disable-libssp \ + --disable-libgomp --disable-libmudflap \ + --with-mpfr=${STAGING_DIR_HOST}${layout_exec_prefix} \ + --with-mpc=${STAGING_DIR_HOST}${layout_exec_prefix}" + +# gcc 4.7 needs -isystem +export 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 @@ -inherit cross-canadian - require recipes-devtools/gcc/gcc-${PV}.inc require gcc-cross-canadian.inc -require gcc-configure-sdk.inc -require gcc-package-sdk.inc - -DEPENDS += "nativesdk-gmp nativesdk-mpfr nativesdk-libmpc nativesdk-elfutils" -RDEPENDS_${PN} += "nativesdk-mpfr nativesdk-libmpc nativesdk-elfutils" - -SYSTEMHEADERS = "/usr/include" -SYSTEMLIBS = "${target_base_libdir}/" -SYSTEMLIBS1 = "${target_libdir}/" - -EXTRA_OECONF += "--disable-libunwind-exceptions --disable-libssp \ - --disable-libgomp --disable-libmudflap \ - --with-mpfr=${STAGING_DIR_HOST}${layout_exec_prefix} \ - --with-mpc=${STAGING_DIR_HOST}${layout_exec_prefix}" - -# to find libmpfr -# export LD_LIBRARY_PATH = "{STAGING_DIR_HOST}${layout_exec_prefix}" - -PARALLEL_MAKE = "" -# gcc 4.7 needs -isystem -export 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 @@ -inherit cross-canadian - require recipes-devtools/gcc/gcc-${PV}.inc require gcc-cross-canadian.inc -require gcc-configure-sdk.inc -require gcc-package-sdk.inc - -ELFUTILS = "nativesdk-elfutils" -DEPENDS += "nativesdk-gmp nativesdk-mpfr nativesdk-libmpc ${ELFUTILS} nativesdk-zlib" -RDEPENDS_${PN} += "nativesdk-mpfr nativesdk-libmpc ${ELFUTILS}" - -SYSTEMHEADERS = "/usr/include" -SYSTEMLIBS = "${target_base_libdir}/" -SYSTEMLIBS1 = "${target_libdir}/" -EXTRA_OECONF += "--disable-libunwind-exceptions --disable-libssp \ - --disable-libgomp --disable-libmudflap \ - --with-mpfr=${STAGING_DIR_HOST}${layout_exec_prefix} \ - --with-mpc=${STAGING_DIR_HOST}${layout_exec_prefix}" -# to find libmpfr -# export LD_LIBRARY_PATH = "{STAGING_DIR_HOST}${layout_exec_prefix}" -# gcc 4.7 needs -isystem -export ARCH_FLAGS_FOR_TARGET = "--sysroot=${STAGING_DIR_TARGET} -isystem=${target_includedir}" |