Toolchain: eglibc: as eglibc-2.9 does not build without OPTION_EGLIBC_LOCALE_CODE enable it unconditionally

Signed-off-by: Abdoulaye Walsimou Gaye <walsimou@walsimou.com>

2 files changed, 3 insertions, 113 deletions

diff --git a/kconfig/option-groups.def-2.9 b/kconfig/option-groups.def-2.9
index aaece70..7e10599 100644
--- a/kconfig/option-groups.def-2.9
+++ b/kconfig/option-groups.def-2.9
@@ -620,115 +620,6 @@ config OPTION_EGLIBC_WORDEXP
         performing word expansion in the manner of the shell, and the
         accompanying 'wordfree' function.
 
-config OPTION_POSIX_C_LANG_WIDE_CHAR
-    bool "ISO C library wide character functions, excluding I/O"
-    help
-        This option group includes the functions defined by the ISO C
-        standard for working with wide and multibyte characters in
-        memory.  Functions for reading and writing wide and multibyte
-        characters from and to files call in the
-        OPTION_POSIX_WIDE_CHAR_DEVICE_IO option group.
-
-        This option group includes the following functions:
-
-          btowc         mbsinit       wcscspn       wcstoll
-          iswalnum      mbsrtowcs     wcsftime      wcstombs
-          iswalpha      mbstowcs      wcslen        wcstoul
-          iswblank      mbtowc        wcsncat       wcstoull
-          iswcntrl      swprintf      wcsncmp       wcstoumax
-          iswctype      swscanf       wcsncpy       wcsxfrm
-          iswdigit      towctrans     wcspbrk       wctob
-          iswgraph      towlower      wcsrchr       wctomb
-          iswlower      towupper      wcsrtombs     wctrans
-          iswprint      vswprintf     wcsspn        wctype
-          iswpunct      vswscanf      wcsstr        wmemchr
-          iswspace      wcrtomb       wcstod        wmemcmp
-          iswupper      wcscat        wcstof        wmemcpy
-          iswxdigit     wcschr        wcstoimax     wmemmove
-          mblen         wcscmp        wcstok        wmemset
-          mbrlen        wcscoll       wcstol
-          mbrtowc       wcscpy        wcstold
-
-config OPTION_POSIX_WIDE_CHAR_DEVICE_IO
-    bool "Input and output functions for wide characters"
-    depends on OPTION_POSIX_C_LANG_WIDE_CHAR
-    help
-        This option group includes functions for reading and writing
-        wide characters to and from <stdio.h> streams.
-
-        This option group includes the following functions:
-
-          fgetwc        fwprintf      putwchar      vwscanf
-          fgetws        fwscanf       ungetwc       wprintf
-          fputwc        getwc         vfwprintf     wscanf
-          fputws        getwchar      vfwscanf
-          fwide         putwc         vwprintf
-
-        This option group further includes the following unlocked
-        variants of the above functions:
-
-          fgetwc_unlocked           getwc_unlocked
-          fgetws_unlocked           getwchar_unlocked
-          fputwc_unlocked           putwc_unlocked
-          fputws_unlocked           putwchar_unlocked
-                    
-        Note that the GNU standard C++ library, 'libstdc++.so', uses
-        some of these functions; you will not be able to link or run
-        C++ programs if you disable this option group.
-
-        This option group also affects the behavior of the following
-        functions:
-
-          fdopen
-          fopen
-          fopen64
-          freopen
-          freopen64
-
-        These functions all take an OPENTYPE parameter which may
-        contain a string of the form ",ccs=CHARSET", indicating that
-        the underlying file uses the character set named CHARSET.
-        This produces a wide-oriented stream, which is only useful
-        when the functions included in this option group are present.
-        If the user attempts to open a file specifying a character set
-        in the OPENTYPE parameter, and EGLIBC was built with this
-        option group disabled, the function returns NULL, and sets
-        errno to EINVAL.
-
-config OPTION_EGLIBC_LOCALE_CODE
-   bool "Locale functions"
-   depends on OPTION_POSIX_C_LANG_WIDE_CHAR
-   help
-       This option group includes locale support functions, programs,
-       and libraries.  With OPTION_EGLIBC_LOCALE_FUNCTIONS disabled,
-       EGLIBC supports only the 'C' locale (also known as 'POSIX'),
-       and ignores the settings of the 'LANG' and 'LC_*' environment
-       variables.
-
-       With OPTION_EGLIBC_LOCALE_CODE disabled, the following
-       functions are omitted from libc:
-
-         duplocale   localeconv  nl_langinfo    rpmatch  strfmon_l
-         freelocale  newlocale   nl_langinfo_l  strfmon  uselocale
-
-       Furthermore, only the LC_CTYPE and LC_TIME categories of the
-       standard "C" locale are available.
-
-       The OPTION_EGLIBC_CATGETS option group depends on this option
-       group; if you disable OPTION_EGLIBC_LOCALE_CODE, you must also
-       disable OPTION_EGLIBC_CATGETS.
-
-config OPTION_EGLIBC_CATGETS
-   bool "Functions for accessing message catalogs"
-   depends on OPTION_EGLIBC_LOCALE_CODE
-   help
-       This option group includes functions for accessing message
-       catalogs: catopen, catclose, and catgets.
-
-       This option group depends on the OPTION_EGLIBC_LOCALE_CODE
-       option group; if you disable that, you must also disable this.
-
-
 config OPTION_POSIX_REGEXP
     default y
     bool "Regular expressions"
diff --git a/mk/eglibc-2.9-options.mk b/mk/eglibc-2.9-options.mk
index 3b9daab..c3af172 100644
--- a/mk/eglibc-2.9-options.mk
+++ b/mk/eglibc-2.9-options.mk
@@ -23,13 +23,12 @@
 #########################################################################################
 
 EGLIBC_OPTIONS := OPTION_EGLIBC_ADVANCED_INET6 OPTION_EGLIBC_BACKTRACE OPTION_EGLIBC_BSD \
-		OPTION_EGLIBC_BSD OPTION_EGLIBC_CXX_TESTS OPTION_EGLIBC_CATGETS \
+		OPTION_EGLIBC_BSD OPTION_EGLIBC_CXX_TESTS\
 		OPTION_EGLIBC_CHARSETS OPTION_EGLIBC_DB_ALIASES OPTION_EGLIBC_ENVZ \
 		OPTION_EGLIBC_FSTAB OPTION_EGLIBC_GETLOGIN OPTION_EGLIBC_INET \
-		OPTION_EGLIBC_LIBM OPTION_EGLIBC_LOCALES OPTION_EGLIBC_LOCALE_CODE \
+		OPTION_EGLIBC_LIBM OPTION_EGLIBC_LOCALES \
 		OPTION_EGLIBC_NIS OPTION_EGLIBC_NSSWITCH OPTION_EGLIBC_RCMD \
 		OPTION_EGLIBC_SPAWN OPTION_EGLIBC_STREAMS OPTION_EGLIBC_SUNRPC \
 		OPTION_EGLIBC_UTMP OPTION_EGLIBC_UTMPX OPTION_EGLIBC_WORDEXP \
-		OPTION_POSIX_C_LANG_WIDE_CHAR OPTION_POSIX_REGEXP \
-		OPTION_POSIX_WIDE_CHAR_DEVICE_IO
+		OPTION_POSIX_REGEXP