summaryrefslogtreecommitdiffstats
path: root/meta
diff options
context:
space:
mode:
authorKhem Raj <raj.khem@gmail.com>2011-12-14 01:08:45 -0800
committerRichard Purdie <richard.purdie@linuxfoundation.org>2011-12-15 14:36:23 +0000
commit7e0c29c70d126e3ca1a0a0b4f9572c1541dd00ce (patch)
tree5852a77c995ed1149686908b23a2e90e46a4c751 /meta
parent91367de75575e79a94b2f90b6b7aa8740a039fc5 (diff)
downloadpoky-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>
Diffstat (limited to 'meta')
-rw-r--r--meta/classes/gettext.bbclass6
-rw-r--r--meta/recipes-devtools/binutils/binutils-cross.inc1
-rw-r--r--meta/recipes-devtools/gcc/gcc-configure-cross.inc1
-rw-r--r--meta/recipes-devtools/gcc/gcc-cross-initial.inc1
-rw-r--r--meta/recipes-devtools/gcc/gcc-cross-intermediate.inc1
5 files changed, 3 insertions, 7 deletions
diff --git a/meta/classes/gettext.bbclass b/meta/classes/gettext.bbclass
index 1793748af2..89faa30eca 100644
--- a/meta/classes/gettext.bbclass
+++ b/meta/classes/gettext.bbclass
@@ -3,15 +3,15 @@ def gettext_dependencies(d):
3 return "" 3 return ""
4 if d.getVar('INHIBIT_DEFAULT_DEPS', True) and not oe.utils.inherits(d, 'cross-canadian'): 4 if d.getVar('INHIBIT_DEFAULT_DEPS', True) and not oe.utils.inherits(d, 'cross-canadian'):
5 return "" 5 return ""
6 if oe.utils.inherits(d, 'native'): 6 if oe.utils.inherits(d, 'native', 'cross'):
7 return "gettext-minimal-native" 7 return "gettext-minimal-native"
8 return d.getVar('DEPENDS_GETTEXT', False) 8 return d.getVar('DEPENDS_GETTEXT', False)
9 9
10def gettext_oeconf(d): 10def gettext_oeconf(d):
11 if oe.utils.inherits(d, 'native'): 11 if oe.utils.inherits(d, 'native', 'cross'):
12 return '--disable-nls' 12 return '--disable-nls'
13 # Remove the NLS bits if USE_NLS is no. 13 # Remove the NLS bits if USE_NLS is no.
14 if d.getVar('USE_NLS', True) == 'no' and not oe.utils.inherits(d, 'native', 'nativesdk', 'cross', 'cross-canadian'): 14 if d.getVar('USE_NLS', True) == 'no' and not oe.utils.inherits(d, 'nativesdk', 'cross-canadian'):
15 return '--disable-nls' 15 return '--disable-nls'
16 return "--enable-nls" 16 return "--enable-nls"
17 17
diff --git a/meta/recipes-devtools/binutils/binutils-cross.inc b/meta/recipes-devtools/binutils/binutils-cross.inc
index f07907ef13..80152a9b4c 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} \
8 --program-prefix=${TARGET_PREFIX} \ 8 --program-prefix=${TARGET_PREFIX} \
9 --disable-install-libbfd \ 9 --disable-install-libbfd \
10 --disable-werror \ 10 --disable-werror \
11 --disable-nls \
12 --enable-poison-system-directories \ 11 --enable-poison-system-directories \
13 ${@base_contains('DISTRO_FEATURES', 'ld-is-gold', '--enable-gold=default', '', d)} \ 12 ${@base_contains('DISTRO_FEATURES', 'ld-is-gold', '--enable-gold=default', '', d)} \
14 ${@base_contains('DISTRO_FEATURES', 'multiarch', '--enable-64-bit-bfd', '', d)}" 13 ${@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 d2d908140e..3e3742349d 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 )}'
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 \
8 " 7 "
9 8
10INHIBIT_DEFAULT_DEPS = "1" 9INHIBIT_DEFAULT_DEPS = "1"
diff --git a/meta/recipes-devtools/gcc/gcc-cross-initial.inc b/meta/recipes-devtools/gcc/gcc-cross-initial.inc
index d58bf7083e..f0e7810273 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} \
14 --without-headers \ 14 --without-headers \
15 --disable-shared \ 15 --disable-shared \
16 --disable-threads \ 16 --disable-threads \
17 --disable-nls \
18 --disable-multilib \ 17 --disable-multilib \
19 --disable-__cxa_atexit \ 18 --disable-__cxa_atexit \
20 --enable-languages=c \ 19 --enable-languages=c \
diff --git a/meta/recipes-devtools/gcc/gcc-cross-intermediate.inc b/meta/recipes-devtools/gcc/gcc-cross-intermediate.inc
index f368ae9d7e..ea105e6eb0 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}"
16# preferred linker. 16# preferred linker.
17EXTRA_OECONF = "--with-local-prefix=${STAGING_DIR_TARGET}${target_prefix} \ 17EXTRA_OECONF = "--with-local-prefix=${STAGING_DIR_TARGET}${target_prefix} \
18 --enable-shared \ 18 --enable-shared \
19 --disable-nls \
20 --disable-multilib \ 19 --disable-multilib \
21 --disable-threads \ 20 --disable-threads \
22 --enable-languages=c \ 21 --enable-languages=c \