diff options
| author | Khem Raj <raj.khem@gmail.com> | 2011-12-14 01:08:45 -0800 |
|---|---|---|
| committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2011-12-15 14:36:23 +0000 |
| commit | 7e0c29c70d126e3ca1a0a0b4f9572c1541dd00ce (patch) | |
| tree | 5852a77c995ed1149686908b23a2e90e46a4c751 | |
| parent | 91367de75575e79a94b2f90b6b7aa8740a039fc5 (diff) | |
| download | ast2050-yocto-poky-7e0c29c70d126e3ca1a0a0b4f9572c1541dd00ce.zip ast2050-yocto-poky-7e0c29c70d126e3ca1a0a0b4f9572c1541dd00ce.tar.gz | |
cross-recipes: Disable nls in gettext bbclass
Right now for cross recipes e.g. gcc-cross and binutils-cross
we specify --disable-nls .... --enable-nls on configure cmdline
the --enable-nls coming from gettext bbclass.
So we disable nls for all cross inheriting recipes in gettext
bbclass and then we remove the extra --disable-nls in gcc-cross
and binutils-cross
This patch needs testing. Please help
(From OE-Core rev: d66b379f809b9c75981848fcc71ed5de13382bf7)
Signed-off-by: Khem Raj <raj.khem@gmail.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
| -rw-r--r-- | meta/classes/gettext.bbclass | 6 | ||||
| -rw-r--r-- | meta/recipes-devtools/binutils/binutils-cross.inc | 1 | ||||
| -rw-r--r-- | meta/recipes-devtools/gcc/gcc-configure-cross.inc | 1 | ||||
| -rw-r--r-- | meta/recipes-devtools/gcc/gcc-cross-initial.inc | 1 | ||||
| -rw-r--r-- | meta/recipes-devtools/gcc/gcc-cross-intermediate.inc | 1 |
5 files changed, 3 insertions, 7 deletions
diff --git a/meta/classes/gettext.bbclass b/meta/classes/gettext.bbclass index 1793748..89faa30 100644 --- a/meta/classes/gettext.bbclass +++ b/meta/classes/gettext.bbclass @@ -3,15 +3,15 @@ def gettext_dependencies(d): return "" if d.getVar('INHIBIT_DEFAULT_DEPS', True) and not oe.utils.inherits(d, 'cross-canadian'): return "" - if oe.utils.inherits(d, 'native'): + if oe.utils.inherits(d, 'native', 'cross'): return "gettext-minimal-native" return d.getVar('DEPENDS_GETTEXT', False) def gettext_oeconf(d): - if oe.utils.inherits(d, 'native'): + if oe.utils.inherits(d, 'native', 'cross'): return '--disable-nls' # Remove the NLS bits if USE_NLS is no. - if d.getVar('USE_NLS', True) == 'no' and not oe.utils.inherits(d, 'native', 'nativesdk', 'cross', 'cross-canadian'): + if d.getVar('USE_NLS', True) == 'no' and not oe.utils.inherits(d, 'nativesdk', 'cross-canadian'): return '--disable-nls' return "--enable-nls" diff --git a/meta/recipes-devtools/binutils/binutils-cross.inc b/meta/recipes-devtools/binutils/binutils-cross.inc index f07907e..80152a9 100644 --- a/meta/recipes-devtools/binutils/binutils-cross.inc +++ b/meta/recipes-devtools/binutils/binutils-cross.inc @@ -8,7 +8,6 @@ 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)} \ ${@base_contains('DISTRO_FEATURES', 'multiarch', '--enable-64-bit-bfd', '', d)}" diff --git a/meta/recipes-devtools/gcc/gcc-configure-cross.inc b/meta/recipes-devtools/gcc/gcc-configure-cross.inc index d2d9081..3e37423 100644 --- a/meta/recipes-devtools/gcc/gcc-configure-cross.inc +++ b/meta/recipes-devtools/gcc/gcc-configure-cross.inc @@ -4,7 +4,6 @@ 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" diff --git a/meta/recipes-devtools/gcc/gcc-cross-initial.inc b/meta/recipes-devtools/gcc/gcc-cross-initial.inc index d58bf70..f0e7810 100644 --- a/meta/recipes-devtools/gcc/gcc-cross-initial.inc +++ b/meta/recipes-devtools/gcc/gcc-cross-initial.inc @@ -14,7 +14,6 @@ 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 f368ae9..ea105e6 100644 --- a/meta/recipes-devtools/gcc/gcc-cross-intermediate.inc +++ b/meta/recipes-devtools/gcc/gcc-cross-intermediate.inc @@ -16,7 +16,6 @@ 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 \ |
