diff options
| author | Richard Purdie <richard.purdie@linuxfoundation.org> | 2011-10-07 14:19:15 +0100 |
|---|---|---|
| committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2011-10-10 09:54:02 +0100 |
| commit | 54a3e2ee37003fc56af0339f857b0b6442790c26 (patch) | |
| tree | 4bc1e186c3b3cffe98df35e2d801754f7bdc58af /meta | |
| parent | 6ce8d028f2a542eceb270aeb511929953a859d39 (diff) | |
| download | openembedded-core-54a3e2ee37003fc56af0339f857b0b6442790c26.tar.gz openembedded-core-54a3e2ee37003fc56af0339f857b0b6442790c26.tar.bz2 openembedded-core-54a3e2ee37003fc56af0339f857b0b6442790c26.zip | |
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.
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta')
| -rw-r--r-- | meta/recipes-devtools/binutils/binutils-cross.inc | 4 | ||||
| -rw-r--r-- | meta/recipes-devtools/gcc/gcc-4.6.inc | 3 | ||||
| -rw-r--r-- | meta/recipes-devtools/gcc/gcc-configure-cross.inc | 3 | ||||
| -rw-r--r-- | meta/recipes-devtools/gcc/gcc-cross-initial.inc | 6 | ||||
| -rw-r--r-- | meta/recipes-devtools/gcc/gcc-cross-intermediate.inc | 6 |
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 @@ inherit cross PROVIDES = "virtual/${TARGET_PREFIX}binutils" +INHIBIT_DEFAULT_DEPS = "1" +INHIBIT_AUTOTOOLS_DEPS = "1" + EXTRA_OECONF = "--with-sysroot=${STAGING_DIR_TARGET} \ --program-prefix=${TARGET_PREFIX} \ --disable-install-libbfd \ --disable-werror \ + --disable-nls \ --enable-poison-system-directories \ ${@base_contains('DISTRO_FEATURES', 'ld-is-gold', '--enable-gold=default', '', d)}" 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" FILESPATH = "${@base_set_filespath([ '${FILE_DIRNAME}/gcc-4.6' ], d)}" DEPENDS =+ "mpfr gmp libmpc" -NATIVEDEPS = "mpfr-native gmp-native gettext-native libmpc-native" +NATIVEDEPS = "mpfr-native gmp-native libmpc-native" LICENSE="GPL-3.0-with-GCC-exception & GPLv3" @@ -108,3 +108,4 @@ EXTRA_OECONF_INTERMEDIATE = "--disable-libmudflap \ EXTRA_OECONF_append_linux-uclibc = " --disable-decimal-float " EXTRA_OECONF_append_linux-uclibceabi = " --disable-decimal-float " EXTRA_OECONF_append_linux-uclibcspe = " --disable-decimal-float " + 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 )}' EXTRA_OECONF += " --enable-poison-system-directories \ --with-headers=${STAGING_DIR_TARGET}${SYSTEMHEADERS} \ + --disable-nls \ " +INHIBIT_DEFAULT_DEPS = "1" + EXTRA_OECONF_PATHS = "--with-local-prefix=${STAGING_DIR_TARGET}${target_exec_prefix} \ --with-gxx-include-dir=${target_includedir}/c++ \ --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 @@ -DEPENDS = "virtual/${TARGET_PREFIX}binutils gettext-native ${NATIVEDEPS}" +DEPENDS = "virtual/${TARGET_PREFIX}binutils ${NATIVEDEPS}" PROVIDES = "virtual/${TARGET_PREFIX}gcc-initial" PACKAGES = "" +INHIBIT_AUTOTOOLS_DEPS = "1" +INHIBIT_DEFAULT_DEPS = "1" + CROSS_TARGET_SYS_DIR_append = ".${PN}" # This is intended to be a -very- basic config @@ -11,6 +14,7 @@ EXTRA_OECONF = "--with-local-prefix=${STAGING_DIR_TARGET}${target_prefix} \ --without-headers \ --disable-shared \ --disable-threads \ + --disable-nls \ --disable-multilib \ --disable-__cxa_atexit \ --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 @@ DEPENDS = "virtual/${TARGET_PREFIX}binutils ${NATIVEDEPS}" -DEPENDS += "virtual/${TARGET_PREFIX}libc-initial gettext-native" +DEPENDS += "virtual/${TARGET_PREFIX}libc-initial" PROVIDES = "virtual/${TARGET_PREFIX}gcc-intermediate" PACKAGES = "" +INHIBIT_DEFAULT_DEPS = "1" +INHIBIT_AUTOTOOLS_DEPS = "1" + CROSS_TARGET_SYS_DIR_append = ".${PN}" # This is intended to be a -very- basic config @@ -13,6 +16,7 @@ CROSS_TARGET_SYS_DIR_append = ".${PN}" # preferred linker. EXTRA_OECONF = "--with-local-prefix=${STAGING_DIR_TARGET}${target_prefix} \ --enable-shared \ + --disable-nls \ --disable-multilib \ --disable-threads \ --enable-languages=c \ |