Message ID | 1431553177-7280-22-git-send-email-clayton.shotwell@rockwellcollins.com |
---|---|
State | Superseded |
Headers | show |
Clayton, On Wed, May 13, 2015 at 4:39 PM, Clayton Shotwell <clayton.shotwell@rockwellcollins.com> wrote: > From: Matt Weber <matthew.weber@rockwellcollins.com> > > --- > package/bash/Config.in | 10 ++++++++++ > package/bash/bash.mk | 9 +++++++++ > 2 files changed, 19 insertions(+) > <snip> This patch needs to be removed from v6. Accidentally included....
diff --git a/package/bash/Config.in b/package/bash/Config.in index 2f823dc..171d2ad 100644 --- a/package/bash/Config.in +++ b/package/bash/Config.in @@ -8,3 +8,13 @@ config BR2_PACKAGE_BASH The standard GNU Bourne again shell. http://tiswww.case.edu/php/chet/bash/bashtop.html + +if BR2_PACKAGE_BASH + +config BR2_PACKAGE_BASH_NO_LOCALE + bool "disable locale support" + help + Disable locale support for cases where toolchain has it + but target isn't setup to use it. + +endif diff --git a/package/bash/bash.mk b/package/bash/bash.mk index 9865e19..67a423e 100644 --- a/package/bash/bash.mk +++ b/package/bash/bash.mk @@ -21,6 +21,15 @@ BASH_CONF_ENV += \ bash_cv_func_sigsetjmp=present \ bash_cv_printf_a_format=yes + +ifeq ($(BR2_PACKAGE_BASH_NO_LOCALE),y) +BASH_CONF_ENV += \ + ac_cv_header_locale_h=no \ + ac_cv_func_locale_charset=no \ + ac_cv_func_setlocale=no \ + ac_cv_func_localeconv=no +endif + # Parallel build sometimes fails because some of the generator tools # are built twice (i.e. while executing). BASH_MAKE = $(MAKE1)
From: Matt Weber <matthew.weber@rockwellcollins.com> --- package/bash/Config.in | 10 ++++++++++ package/bash/bash.mk | 9 +++++++++ 2 files changed, 19 insertions(+)