Patchwork [toolchain-layer] gcc-4.6: Update to match gcc restructing in OE-Core

login
register
mail settings
Submitter Khem Raj
Date Aug. 28, 2013, 6:34 a.m.
Message ID <1377671650-16398-1-git-send-email-raj.khem@gmail.com>
Download mbox | patch
Permalink /patch/56797/
State Accepted, archived
Commit 9f26a42638fda6159bf2a68f1db32db1eb72c355
Headers show

Comments

Khem Raj - Aug. 28, 2013, 6:34 a.m.
The include file infra in gcc recipes recieved an overhaul
on OE-Core. This patch matches the toolchain layer recipes
to use the new include files

Signed-off-by: Khem Raj <raj.khem@gmail.com>
---
 .../recipes-devtools/gcc/gcc-cross-canadian_4.6.bb    | 19 -------------------
 toolchain-layer/recipes-devtools/gcc/gcc-cross_4.6.bb |  8 +-------
 .../recipes-devtools/gcc/gcc-runtime_4.6.bb           |  8 +-------
 toolchain-layer/recipes-devtools/gcc/gcc_4.6.bb       |  5 +----
 4 files changed, 3 insertions(+), 37 deletions(-)
Martin Jansa - Sept. 3, 2013, 5:58 p.m.
On Tue, Aug 27, 2013 at 11:34:10PM -0700, Khem Raj wrote:
> The include file infra in gcc recipes recieved an overhaul
> on OE-Core. This patch matches the toolchain layer recipes
> to use the new include files

Applied, thanks!

> 
> Signed-off-by: Khem Raj <raj.khem@gmail.com>
> ---
>  .../recipes-devtools/gcc/gcc-cross-canadian_4.6.bb    | 19 -------------------
>  toolchain-layer/recipes-devtools/gcc/gcc-cross_4.6.bb |  8 +-------
>  .../recipes-devtools/gcc/gcc-runtime_4.6.bb           |  8 +-------
>  toolchain-layer/recipes-devtools/gcc/gcc_4.6.bb       |  5 +----
>  4 files changed, 3 insertions(+), 37 deletions(-)
> 
> diff --git a/toolchain-layer/recipes-devtools/gcc/gcc-cross-canadian_4.6.bb b/toolchain-layer/recipes-devtools/gcc/gcc-cross-canadian_4.6.bb
> index 5c2435f..29ddd67 100644
> --- a/toolchain-layer/recipes-devtools/gcc/gcc-cross-canadian_4.6.bb
> +++ b/toolchain-layer/recipes-devtools/gcc/gcc-cross-canadian_4.6.bb
> @@ -2,22 +2,3 @@ inherit cross-canadian
>  
>  require recipes-devtools/gcc/gcc-${PV}.inc
>  require recipes-devtools/gcc/gcc-cross-canadian.inc
> -require recipes-devtools/gcc/gcc-configure-sdk.inc
> -require recipes-devtools/gcc/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 = "/lib/"
> -SYSTEMLIBS1 = "/usr/lib/"
> -
> -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 = ""
> diff --git a/toolchain-layer/recipes-devtools/gcc/gcc-cross_4.6.bb b/toolchain-layer/recipes-devtools/gcc/gcc-cross_4.6.bb
> index eb8896c..cdaa7e8 100644
> --- a/toolchain-layer/recipes-devtools/gcc/gcc-cross_4.6.bb
> +++ b/toolchain-layer/recipes-devtools/gcc/gcc-cross_4.6.bb
> @@ -1,8 +1,2 @@
>  require recipes-devtools/gcc/gcc-${PV}.inc
> -require recipes-devtools/gcc/gcc-cross4.inc
> -
> -EXTRA_OECONF += "--disable-libunwind-exceptions \
> -                 --with-mpfr=${STAGING_DIR_NATIVE}${prefix_native} \
> -                 --with-system-zlib "
> -
> -ARCH_FLAGS_FOR_TARGET += "-isystem${STAGING_DIR_TARGET}${target_includedir}"
> +require recipes-devtools/gcc/gcc-cross.inc
> diff --git a/toolchain-layer/recipes-devtools/gcc/gcc-runtime_4.6.bb b/toolchain-layer/recipes-devtools/gcc/gcc-runtime_4.6.bb
> index 13431c8..b755f55 100644
> --- a/toolchain-layer/recipes-devtools/gcc/gcc-runtime_4.6.bb
> +++ b/toolchain-layer/recipes-devtools/gcc/gcc-runtime_4.6.bb
> @@ -1,8 +1,2 @@
>  require recipes-devtools/gcc/gcc-${PV}.inc
> -require recipes-devtools/gcc/gcc-configure-runtime.inc
> -require recipes-devtools/gcc/gcc-package-runtime.inc
> -
> -ARCH_FLAGS_FOR_TARGET += "-isystem${STAGING_INCDIR}"
> -
> -EXTRA_OECONF += "--disable-libunwind-exceptions"
> -EXTRA_OECONF_append_linuxstdbase = " --enable-clocale=gnu"
> +require recipes-devtools/gcc/gcc-runtime.inc
> diff --git a/toolchain-layer/recipes-devtools/gcc/gcc_4.6.bb b/toolchain-layer/recipes-devtools/gcc/gcc_4.6.bb
> index 97e6c32..6ad8973 100644
> --- a/toolchain-layer/recipes-devtools/gcc/gcc_4.6.bb
> +++ b/toolchain-layer/recipes-devtools/gcc/gcc_4.6.bb
> @@ -1,5 +1,2 @@
>  require recipes-devtools/gcc/gcc-${PV}.inc
> -require recipes-devtools/gcc/gcc-configure-target.inc
> -require recipes-devtools/gcc/gcc-package-target.inc
> -
> -ARCH_FLAGS_FOR_TARGET += "-isystem${STAGING_INCDIR}"
> +require recipes-devtools/gcc/gcc-target.inc
> -- 
> 1.8.4
> 
> _______________________________________________
> Openembedded-devel mailing list
> Openembedded-devel@lists.openembedded.org
> http://lists.openembedded.org/mailman/listinfo/openembedded-devel

Patch

diff --git a/toolchain-layer/recipes-devtools/gcc/gcc-cross-canadian_4.6.bb b/toolchain-layer/recipes-devtools/gcc/gcc-cross-canadian_4.6.bb
index 5c2435f..29ddd67 100644
--- a/toolchain-layer/recipes-devtools/gcc/gcc-cross-canadian_4.6.bb
+++ b/toolchain-layer/recipes-devtools/gcc/gcc-cross-canadian_4.6.bb
@@ -2,22 +2,3 @@  inherit cross-canadian
 
 require recipes-devtools/gcc/gcc-${PV}.inc
 require recipes-devtools/gcc/gcc-cross-canadian.inc
-require recipes-devtools/gcc/gcc-configure-sdk.inc
-require recipes-devtools/gcc/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 = "/lib/"
-SYSTEMLIBS1 = "/usr/lib/"
-
-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 = ""
diff --git a/toolchain-layer/recipes-devtools/gcc/gcc-cross_4.6.bb b/toolchain-layer/recipes-devtools/gcc/gcc-cross_4.6.bb
index eb8896c..cdaa7e8 100644
--- a/toolchain-layer/recipes-devtools/gcc/gcc-cross_4.6.bb
+++ b/toolchain-layer/recipes-devtools/gcc/gcc-cross_4.6.bb
@@ -1,8 +1,2 @@ 
 require recipes-devtools/gcc/gcc-${PV}.inc
-require recipes-devtools/gcc/gcc-cross4.inc
-
-EXTRA_OECONF += "--disable-libunwind-exceptions \
-                 --with-mpfr=${STAGING_DIR_NATIVE}${prefix_native} \
-                 --with-system-zlib "
-
-ARCH_FLAGS_FOR_TARGET += "-isystem${STAGING_DIR_TARGET}${target_includedir}"
+require recipes-devtools/gcc/gcc-cross.inc
diff --git a/toolchain-layer/recipes-devtools/gcc/gcc-runtime_4.6.bb b/toolchain-layer/recipes-devtools/gcc/gcc-runtime_4.6.bb
index 13431c8..b755f55 100644
--- a/toolchain-layer/recipes-devtools/gcc/gcc-runtime_4.6.bb
+++ b/toolchain-layer/recipes-devtools/gcc/gcc-runtime_4.6.bb
@@ -1,8 +1,2 @@ 
 require recipes-devtools/gcc/gcc-${PV}.inc
-require recipes-devtools/gcc/gcc-configure-runtime.inc
-require recipes-devtools/gcc/gcc-package-runtime.inc
-
-ARCH_FLAGS_FOR_TARGET += "-isystem${STAGING_INCDIR}"
-
-EXTRA_OECONF += "--disable-libunwind-exceptions"
-EXTRA_OECONF_append_linuxstdbase = " --enable-clocale=gnu"
+require recipes-devtools/gcc/gcc-runtime.inc
diff --git a/toolchain-layer/recipes-devtools/gcc/gcc_4.6.bb b/toolchain-layer/recipes-devtools/gcc/gcc_4.6.bb
index 97e6c32..6ad8973 100644
--- a/toolchain-layer/recipes-devtools/gcc/gcc_4.6.bb
+++ b/toolchain-layer/recipes-devtools/gcc/gcc_4.6.bb
@@ -1,5 +1,2 @@ 
 require recipes-devtools/gcc/gcc-${PV}.inc
-require recipes-devtools/gcc/gcc-configure-target.inc
-require recipes-devtools/gcc/gcc-package-target.inc
-
-ARCH_FLAGS_FOR_TARGET += "-isystem${STAGING_INCDIR}"
+require recipes-devtools/gcc/gcc-target.inc