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>
This commit is contained in:
parent
91367de755
commit
7e0c29c70d
|
@ -3,15 +3,15 @@ def gettext_dependencies(d):
|
||||||
return ""
|
return ""
|
||||||
if d.getVar('INHIBIT_DEFAULT_DEPS', True) and not oe.utils.inherits(d, 'cross-canadian'):
|
if d.getVar('INHIBIT_DEFAULT_DEPS', True) and not oe.utils.inherits(d, 'cross-canadian'):
|
||||||
return ""
|
return ""
|
||||||
if oe.utils.inherits(d, 'native'):
|
if oe.utils.inherits(d, 'native', 'cross'):
|
||||||
return "gettext-minimal-native"
|
return "gettext-minimal-native"
|
||||||
return d.getVar('DEPENDS_GETTEXT', False)
|
return d.getVar('DEPENDS_GETTEXT', False)
|
||||||
|
|
||||||
def gettext_oeconf(d):
|
def gettext_oeconf(d):
|
||||||
if oe.utils.inherits(d, 'native'):
|
if oe.utils.inherits(d, 'native', 'cross'):
|
||||||
return '--disable-nls'
|
return '--disable-nls'
|
||||||
# Remove the NLS bits if USE_NLS is no.
|
# 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 '--disable-nls'
|
||||||
return "--enable-nls"
|
return "--enable-nls"
|
||||||
|
|
||||||
|
|
|
@ -8,7 +8,6 @@ EXTRA_OECONF = "--with-sysroot=${STAGING_DIR_TARGET} \
|
||||||
--program-prefix=${TARGET_PREFIX} \
|
--program-prefix=${TARGET_PREFIX} \
|
||||||
--disable-install-libbfd \
|
--disable-install-libbfd \
|
||||||
--disable-werror \
|
--disable-werror \
|
||||||
--disable-nls \
|
|
||||||
--enable-poison-system-directories \
|
--enable-poison-system-directories \
|
||||||
${@base_contains('DISTRO_FEATURES', 'ld-is-gold', '--enable-gold=default', '', d)} \
|
${@base_contains('DISTRO_FEATURES', 'ld-is-gold', '--enable-gold=default', '', d)} \
|
||||||
${@base_contains('DISTRO_FEATURES', 'multiarch', '--enable-64-bit-bfd', '', d)}"
|
${@base_contains('DISTRO_FEATURES', 'multiarch', '--enable-64-bit-bfd', '', d)}"
|
||||||
|
|
|
@ -4,7 +4,6 @@ USE_NLS = '${@base_conditional( "TARGET_OS", "linux-uclibc", "no", "", d )}'
|
||||||
|
|
||||||
EXTRA_OECONF += " --enable-poison-system-directories \
|
EXTRA_OECONF += " --enable-poison-system-directories \
|
||||||
--with-headers=${STAGING_DIR_TARGET}${SYSTEMHEADERS} \
|
--with-headers=${STAGING_DIR_TARGET}${SYSTEMHEADERS} \
|
||||||
--disable-nls \
|
|
||||||
"
|
"
|
||||||
|
|
||||||
INHIBIT_DEFAULT_DEPS = "1"
|
INHIBIT_DEFAULT_DEPS = "1"
|
||||||
|
|
|
@ -14,7 +14,6 @@ EXTRA_OECONF = "--with-local-prefix=${STAGING_DIR_TARGET}${target_prefix} \
|
||||||
--without-headers \
|
--without-headers \
|
||||||
--disable-shared \
|
--disable-shared \
|
||||||
--disable-threads \
|
--disable-threads \
|
||||||
--disable-nls \
|
|
||||||
--disable-multilib \
|
--disable-multilib \
|
||||||
--disable-__cxa_atexit \
|
--disable-__cxa_atexit \
|
||||||
--enable-languages=c \
|
--enable-languages=c \
|
||||||
|
|
|
@ -16,7 +16,6 @@ CROSS_TARGET_SYS_DIR_append = ".${PN}"
|
||||||
# preferred linker.
|
# preferred linker.
|
||||||
EXTRA_OECONF = "--with-local-prefix=${STAGING_DIR_TARGET}${target_prefix} \
|
EXTRA_OECONF = "--with-local-prefix=${STAGING_DIR_TARGET}${target_prefix} \
|
||||||
--enable-shared \
|
--enable-shared \
|
||||||
--disable-nls \
|
|
||||||
--disable-multilib \
|
--disable-multilib \
|
||||||
--disable-threads \
|
--disable-threads \
|
||||||
--enable-languages=c \
|
--enable-languages=c \
|
||||||
|
|
Loading…
Reference in New Issue