summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRichard Purdie <richard.purdie@linuxfoundation.org>2011-10-07 14:19:15 +0100
committerRichard Purdie <richard.purdie@linuxfoundation.org>2011-10-10 10:00:07 +0100
commitadd6cf80b91d5f6bd515727f5376092874af9008 (patch)
tree396b7aba322ca081e5004c75282bb9e6e628431a
parent8ea43499885943e1248842e2dfc17060e596be3b (diff)
downloadpoky-add6cf80b91d5f6bd515727f5376092874af9008.tar.gz
gcc/binutils: Disable NLS/gettext dependencies
We force the C locale when running builds for determinstic error messages. We therefore have no need to NLS support in binutils cross or gcc cross. We also don't need the standard base/autotools dependencies for our toolchain components since we don't autoreconf these. This patch turns off nls and cleans up some of the dependencies resulting in a slightly less convoluted set of build dependencies. (From OE-Core rev: 54a3e2ee37003fc56af0339f857b0b6442790c26) Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--meta/recipes-devtools/binutils/binutils-cross.inc4
-rw-r--r--meta/recipes-devtools/gcc/gcc-4.6.inc3
-rw-r--r--meta/recipes-devtools/gcc/gcc-configure-cross.inc3
-rw-r--r--meta/recipes-devtools/gcc/gcc-cross-initial.inc6
-rw-r--r--meta/recipes-devtools/gcc/gcc-cross-intermediate.inc6
5 files changed, 19 insertions, 3 deletions
diff --git a/meta/recipes-devtools/binutils/binutils-cross.inc b/meta/recipes-devtools/binutils/binutils-cross.inc
index 5a41970ce2..982224ff2f 100644
--- a/meta/recipes-devtools/binutils/binutils-cross.inc
+++ b/meta/recipes-devtools/binutils/binutils-cross.inc
@@ -1,10 +1,14 @@
1inherit cross 1inherit cross
2PROVIDES = "virtual/${TARGET_PREFIX}binutils" 2PROVIDES = "virtual/${TARGET_PREFIX}binutils"
3 3
4INHIBIT_DEFAULT_DEPS = "1"
5INHIBIT_AUTOTOOLS_DEPS = "1"
6
4EXTRA_OECONF = "--with-sysroot=${STAGING_DIR_TARGET} \ 7EXTRA_OECONF = "--with-sysroot=${STAGING_DIR_TARGET} \
5 --program-prefix=${TARGET_PREFIX} \ 8 --program-prefix=${TARGET_PREFIX} \
6 --disable-install-libbfd \ 9 --disable-install-libbfd \
7 --disable-werror \ 10 --disable-werror \
11 --disable-nls \
8 --enable-poison-system-directories \ 12 --enable-poison-system-directories \
9 ${@base_contains('DISTRO_FEATURES', 'ld-is-gold', '--enable-gold=default', '', d)}" 13 ${@base_contains('DISTRO_FEATURES', 'ld-is-gold', '--enable-gold=default', '', d)}"
10 14
diff --git a/meta/recipes-devtools/gcc/gcc-4.6.inc b/meta/recipes-devtools/gcc/gcc-4.6.inc
index a352e36455..8ca3174317 100644
--- a/meta/recipes-devtools/gcc/gcc-4.6.inc
+++ b/meta/recipes-devtools/gcc/gcc-4.6.inc
@@ -23,7 +23,7 @@ BRANCH = "gcc-4_6-branch"
23FILESPATH = "${@base_set_filespath([ '${FILE_DIRNAME}/gcc-4.6' ], d)}" 23FILESPATH = "${@base_set_filespath([ '${FILE_DIRNAME}/gcc-4.6' ], d)}"
24 24
25DEPENDS =+ "mpfr gmp libmpc" 25DEPENDS =+ "mpfr gmp libmpc"
26NATIVEDEPS = "mpfr-native gmp-native gettext-native libmpc-native" 26NATIVEDEPS = "mpfr-native gmp-native libmpc-native"
27 27
28LICENSE="GPL-3.0-with-GCC-exception & GPLv3" 28LICENSE="GPL-3.0-with-GCC-exception & GPLv3"
29 29
@@ -108,3 +108,4 @@ EXTRA_OECONF_INTERMEDIATE = "--disable-libmudflap \
108EXTRA_OECONF_append_linux-uclibc = " --disable-decimal-float " 108EXTRA_OECONF_append_linux-uclibc = " --disable-decimal-float "
109EXTRA_OECONF_append_linux-uclibceabi = " --disable-decimal-float " 109EXTRA_OECONF_append_linux-uclibceabi = " --disable-decimal-float "
110EXTRA_OECONF_append_linux-uclibcspe = " --disable-decimal-float " 110EXTRA_OECONF_append_linux-uclibcspe = " --disable-decimal-float "
111
diff --git a/meta/recipes-devtools/gcc/gcc-configure-cross.inc b/meta/recipes-devtools/gcc/gcc-configure-cross.inc
index 36edb81e1c..d2d908140e 100644
--- a/meta/recipes-devtools/gcc/gcc-configure-cross.inc
+++ b/meta/recipes-devtools/gcc/gcc-configure-cross.inc
@@ -4,8 +4,11 @@ USE_NLS = '${@base_conditional( "TARGET_OS", "linux-uclibc", "no", "", d )}'
4 4
5EXTRA_OECONF += " --enable-poison-system-directories \ 5EXTRA_OECONF += " --enable-poison-system-directories \
6 --with-headers=${STAGING_DIR_TARGET}${SYSTEMHEADERS} \ 6 --with-headers=${STAGING_DIR_TARGET}${SYSTEMHEADERS} \
7 --disable-nls \
7 " 8 "
8 9
10INHIBIT_DEFAULT_DEPS = "1"
11
9EXTRA_OECONF_PATHS = "--with-local-prefix=${STAGING_DIR_TARGET}${target_exec_prefix} \ 12EXTRA_OECONF_PATHS = "--with-local-prefix=${STAGING_DIR_TARGET}${target_exec_prefix} \
10 --with-gxx-include-dir=${target_includedir}/c++ \ 13 --with-gxx-include-dir=${target_includedir}/c++ \
11 --with-sysroot=${STAGING_DIR_TARGET} \ 14 --with-sysroot=${STAGING_DIR_TARGET} \
diff --git a/meta/recipes-devtools/gcc/gcc-cross-initial.inc b/meta/recipes-devtools/gcc/gcc-cross-initial.inc
index 4e2e343936..d58bf7083e 100644
--- a/meta/recipes-devtools/gcc/gcc-cross-initial.inc
+++ b/meta/recipes-devtools/gcc/gcc-cross-initial.inc
@@ -1,7 +1,10 @@
1DEPENDS = "virtual/${TARGET_PREFIX}binutils gettext-native ${NATIVEDEPS}" 1DEPENDS = "virtual/${TARGET_PREFIX}binutils ${NATIVEDEPS}"
2PROVIDES = "virtual/${TARGET_PREFIX}gcc-initial" 2PROVIDES = "virtual/${TARGET_PREFIX}gcc-initial"
3PACKAGES = "" 3PACKAGES = ""
4 4
5INHIBIT_AUTOTOOLS_DEPS = "1"
6INHIBIT_DEFAULT_DEPS = "1"
7
5CROSS_TARGET_SYS_DIR_append = ".${PN}" 8CROSS_TARGET_SYS_DIR_append = ".${PN}"
6 9
7# This is intended to be a -very- basic config 10# This is intended to be a -very- basic config
@@ -11,6 +14,7 @@ EXTRA_OECONF = "--with-local-prefix=${STAGING_DIR_TARGET}${target_prefix} \
11 --without-headers \ 14 --without-headers \
12 --disable-shared \ 15 --disable-shared \
13 --disable-threads \ 16 --disable-threads \
17 --disable-nls \
14 --disable-multilib \ 18 --disable-multilib \
15 --disable-__cxa_atexit \ 19 --disable-__cxa_atexit \
16 --enable-languages=c \ 20 --enable-languages=c \
diff --git a/meta/recipes-devtools/gcc/gcc-cross-intermediate.inc b/meta/recipes-devtools/gcc/gcc-cross-intermediate.inc
index 7b1bb3861b..f368ae9d7e 100644
--- a/meta/recipes-devtools/gcc/gcc-cross-intermediate.inc
+++ b/meta/recipes-devtools/gcc/gcc-cross-intermediate.inc
@@ -1,8 +1,11 @@
1DEPENDS = "virtual/${TARGET_PREFIX}binutils ${NATIVEDEPS}" 1DEPENDS = "virtual/${TARGET_PREFIX}binutils ${NATIVEDEPS}"
2DEPENDS += "virtual/${TARGET_PREFIX}libc-initial gettext-native" 2DEPENDS += "virtual/${TARGET_PREFIX}libc-initial"
3PROVIDES = "virtual/${TARGET_PREFIX}gcc-intermediate" 3PROVIDES = "virtual/${TARGET_PREFIX}gcc-intermediate"
4PACKAGES = "" 4PACKAGES = ""
5 5
6INHIBIT_DEFAULT_DEPS = "1"
7INHIBIT_AUTOTOOLS_DEPS = "1"
8
6CROSS_TARGET_SYS_DIR_append = ".${PN}" 9CROSS_TARGET_SYS_DIR_append = ".${PN}"
7 10
8# This is intended to be a -very- basic config 11# This is intended to be a -very- basic config
@@ -13,6 +16,7 @@ CROSS_TARGET_SYS_DIR_append = ".${PN}"
13# preferred linker. 16# preferred linker.
14EXTRA_OECONF = "--with-local-prefix=${STAGING_DIR_TARGET}${target_prefix} \ 17EXTRA_OECONF = "--with-local-prefix=${STAGING_DIR_TARGET}${target_prefix} \
15 --enable-shared \ 18 --enable-shared \
19 --disable-nls \
16 --disable-multilib \ 20 --disable-multilib \
17 --disable-threads \ 21 --disable-threads \
18 --enable-languages=c \ 22 --enable-languages=c \