* [PATCH] cross-recipes: Disable nls in gettext bbclass
@ 2011-12-14 9:08 Khem Raj
2011-12-15 19:19 ` Saul Wold
0 siblings, 1 reply; 2+ messages in thread
From: Khem Raj @ 2011-12-14 9:08 UTC (permalink / raw)
To: openembedded-core
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
Signed-off-by: Khem Raj <raj.khem@gmail.com>
---
meta/classes/gettext.bbclass | 6 +++---
meta/recipes-devtools/binutils/binutils-cross.inc | 1 -
meta/recipes-devtools/gcc/gcc-configure-cross.inc | 1 -
meta/recipes-devtools/gcc/gcc-cross-initial.inc | 1 -
.../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 5816768..774dadb 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 \
--
1.7.5.4
^ permalink raw reply related [flat|nested] 2+ messages in thread
* Re: [PATCH] cross-recipes: Disable nls in gettext bbclass
2011-12-14 9:08 [PATCH] cross-recipes: Disable nls in gettext bbclass Khem Raj
@ 2011-12-15 19:19 ` Saul Wold
0 siblings, 0 replies; 2+ messages in thread
From: Saul Wold @ 2011-12-15 19:19 UTC (permalink / raw)
To: Patches and discussions about the oe-core layer
On 12/14/2011 01:08 AM, Khem Raj wrote:
> 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
>
> Signed-off-by: Khem Raj<raj.khem@gmail.com>
> ---
> meta/classes/gettext.bbclass | 6 +++---
> meta/recipes-devtools/binutils/binutils-cross.inc | 1 -
> meta/recipes-devtools/gcc/gcc-configure-cross.inc | 1 -
> meta/recipes-devtools/gcc/gcc-cross-initial.inc | 1 -
> .../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 5816768..774dadb 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 \
Merged into OE-Core
Thanks
Sau!
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2011-12-15 19:26 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2011-12-14 9:08 [PATCH] cross-recipes: Disable nls in gettext bbclass Khem Raj
2011-12-15 19:19 ` Saul Wold
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.