eglibc: Remove older version 2.17

Signed-off-by: Saul Wold <sgw@linux.intel.com>

36 files changed, 0 insertions, 14307 deletions

diff --git a/meta/recipes-core/eglibc/cross-localedef-native_2.17.bb b/meta/recipes-core/eglibc/cross-localedef-native_2.17.bb
deleted file mode 100644
index a099c18d50..0000000000
--- a/meta/recipes-core/eglibc/cross-localedef-native_2.17.bb
+++ /dev/null
@@ -1,49 +0,0 @@
-SUMMARY = "Cross locale generation tool for eglibc"
-HOMEPAGE = "http://www.eglibc.org/home"
-SECTION = "libs"
-LICENSE = "LGPL-2.1"
-
-LIC_DIR = "${WORKDIR}/eglibc-${PV}/libc"
-LIC_FILES_CHKSUM = "file://${LIC_DIR}/LICENSES;md5=e9a558e243b36d3209f380deb394b213 \
-      file://${LIC_DIR}/COPYING;md5=393a5ca445f6965873eca0259a17f833 \
-      file://${LIC_DIR}/posix/rxspencer/COPYRIGHT;md5=dc5485bb394a13b2332ec1c785f5d83a \
-      file://${LIC_DIR}/COPYING.LIB;md5=bbb461211a33b134d42ed5ee802b37ff "
-
-
-inherit native
-inherit autotools
-
-# pick up an eglibc patch
-FILESPATH = "${FILE_DIRNAME}/eglibc-${PV}"
-
-SRC_URI = "http://downloads.yoctoproject.org/releases/eglibc/eglibc-${PV}-svnr22064.tar.bz2 \
-	   file://fix_for_centos_5.8.patch;patchdir=.. \
-	  "
-SRC_URI[md5sum] = "1464af54779c2c7d1078df9ce2e41791"
-SRC_URI[sha256sum] = "97c3991a3772f513cf704841d20c275ac48895fad2e27802dda557c0196cba6b"
-
-S = "${WORKDIR}/eglibc-${PV}/localedef"
-
-do_unpack_append() {
-    bb.build.exec_func('do_move_ports', d)
-}
-
-do_move_ports() {
-        if test -d ${WORKDIR}/eglibc-${PV}/ports ; then
-	    rm -rf ${WORKDIR}/libc/ports
-	    mv ${WORKDIR}/eglibc-${PV}/ports ${WORKDIR}/libc/
-	fi
-}
-
-EXTRA_OECONF = "--with-glibc=${WORKDIR}/eglibc-${PV}/libc"
-CFLAGS += "-DNOT_IN_libc=1"
-
-do_configure () {
-	${S}/configure ${EXTRA_OECONF}
-}
-
-
-do_install() {
-	install -d ${D}${bindir} 
-	install -m 0755 ${B}/localedef ${D}${bindir}/cross-localedef
-}
diff --git a/meta/recipes-core/eglibc/eglibc-2.17/0001-R_ARM_TLS_DTPOFF32.patch b/meta/recipes-core/eglibc/eglibc-2.17/0001-R_ARM_TLS_DTPOFF32.patch
deleted file mode 100644
index b4489e9ae9..0000000000
--- a/meta/recipes-core/eglibc/eglibc-2.17/0001-R_ARM_TLS_DTPOFF32.patch
+++ /dev/null
@@ -1,56 +0,0 @@
-
-Quote from bug 1443 which explains what the patch does : 
-
-  We build some random program and link it with -lust.  When we run it,
-  it dies with a SIGSEGV before reaching main().
-  
-  Libust.so depends on liburcu-bp.so from the usermode-rcu package.
-  Although libust.so is not prelinked, liburcu-bp.so IS prelinked; this
-  is critical.
-  
-  Libust.so uses a TLS / __thread variable that is defined in liburcu-
-  bp.so.  There are special ARM-specific relocation types that allow two
-  shared libraries to share thread-specific data.  This is critical too.
-  
-  One more critical issue: although liburcu-bp.so is prelinked, we can't
-  load it at its prelinked address, because we also link against
-  librt.so, and librt.so uses that address.
-  
-  The dynamic linker is forced to relink liburcu-bp.so at a different
-  address.  In the course of relinking, it processes the special ARM
-  relocation record mentioned above.  The prelinker has already filled
-  in the information, which is a short offset into a table of thread-
-  specific data that is allocated per-thread for each library that uses
-  TLS.  Because the normal behavior of a relocation is to add the symbol
-  value to an addend stored at the address being relocated, we end up
-  adding the short offset to itself, doubling it.
-  
-  Now we have an awkward situation.  The libust.so library doesn't know
-  about the addend, so its TLS data for this element is correct.  The
-  liburcu-bp.so library has a different offset for the element.  When we
-  go to initialize the element for the first time in liburcu-bp.so, we
-  write the address of the result at the doubled (broken) offset.
-  Later, when we refer to the address from libust.so, we check the value
-  at the correct offset, but it's NULL, so we eat hot SIGSEGV.
-
-Upstream-Status: Pending
-
-Signed-off-by: Andrei Dinu <andrei.adrianx.dinu@intel.com>
----
- .../libc/ports/sysdeps/arm/dl-machine.h            |    2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-ndex 8d905e8..dcfa71e 100644
---- libc.orig/ports/sysdeps/arm/dl-machine.h
-+++ libc/ports/sysdeps/arm/dl-machine.h
-@@ -503,7 +503,7 @@ elf_machine_rel (struct link_map *map, const Elf32_Rel *reloc,
- 
- 	case R_ARM_TLS_DTPOFF32:
- 	  if (sym != NULL)
--	    *reloc_addr += sym->st_value;
-+	    *reloc_addr = sym->st_value;
- 	  break;
- 
- 	case R_ARM_TLS_TPOFF32:
--- 
-
diff --git a/meta/recipes-core/eglibc/eglibc-2.17/0001-eglibc-menuconfig-support.patch b/meta/recipes-core/eglibc/eglibc-2.17/0001-eglibc-menuconfig-support.patch
deleted file mode 100644
index 624392666a..0000000000
--- a/meta/recipes-core/eglibc/eglibc-2.17/0001-eglibc-menuconfig-support.patch
+++ /dev/null
@@ -1,1007 +0,0 @@
-Pulled from
-http://www.eglibc.org/archives/patches/msg01042.html
-
-Upstream-Status: Pending
-Signed-off-by: Khem
-
-Hi,
-
-This patch adds 'make menuconfig' support to EGLIBC.
-
-
-EGLIBC can re-use the Linux kernel kconfig host tools ('conf' and 'mconf') unmodified, by passing appropriate environment variables and with some pre- and post-processing on the input/output config files.
-
-There are three new make targets supported, which all are defined in the new libc/options-config/Makefile, which is included by the top-level libc/Makefile:
-
-- 'make defconfig'. This passes 'libc/option-groups.defaults' to 'conf' as a default config, and outputs 'option-groups.config' to the top-level build directory, which will be the same as the default config.
-
-- 'make config'. This is the same line-oriented interface as in the Linux kernel. Input and output is 'option-groups.config' in the top-level build directory.
-
-- 'make menuconfig'. This is the same menu-based interface as in the Linux kernel. Input and output is 'option-groups.config' in the top-level build directory.
-
-
-Pre-Processing:
-
-
-The Linux kernel kconfig tools expect a prefix of "CONFIG_" on all config option names, but EGLIBC expects a prefix of "OPTION_". The pre-processing script, libc/options-config/config-preproc.pl, simply replaces "CONFIG_ with "OPTION_" in the given config file. The libc/options-config/Makefile passes the script output to a temporary config file, which is then passed to 'conf' or 'mconf'.
-
-Post-Processing (libc/options-config/config-postproc.pl):
-
-
-- Disabled options are output as a comment line of the form "# CONFIG_FOO is not set". This needs to be changed to an explicit "CONFIG_FOO=n" in order to be compatible with 'option-groups.awk' which generates the option-groups.h header.
-
-- "CONFIG_" prefix is changed back to "OPTION_".
-
-
-- The kconfig tools will not output anything for options that depend on a parent option, when the parent option is disabled. This implicit disable must be converted to an explicit "CONFIG_FOO=n" in order to be compatible with the way EGLIBC overrides the default option settings in 'libc/option-groups.defaults' with those in 'option-groups.config'.
-
-
-A new configure option, '--with-kconfig=<PATH>', tells EGLIBC where to find the pre-built 'conf' and 'mconf' host tools from Linux kernel builds.
-
-libc/EGLIBC.cross-building is updated to include instructions for using '--with-kconfig' for the final EGLIBC build, and shows how and when to run 'make *config'.
-
-libc/EGLIBC.option-groups is updated to include new information on the menuconfig support.
-
-Thanks,
-
-attached is the updated patch to address above issues.
-
-Steve
-
---
-Steve Longerbeam | Senior Embedded Engineer, ESD Services
-Mentor Embedded(tm) | 46871 Bayside Parkway, Fremont, CA 94538
-P 510.354.5838 | M 408.410.2735
-Nucleus(r) | Linux(r) | Android(tm) | Services | UI | Multi-OS
-
-
-Index: libc/EGLIBC.cross-building
-===================================================================
---- libc.orig/EGLIBC.cross-building	2012-08-21 22:25:49.000000000 -0700
-+++ libc/EGLIBC.cross-building	2012-09-05 21:44:09.749577576 -0700
-@@ -243,9 +243,29 @@
-     > $src/libc/configure \
-     >     --prefix=/usr \
-     >     --with-headers=$sysroot/usr/include \
-+    >     --with-kconfig=$obj/linux/scripts/kconfig \
-     >     --build=$build \
-     >     --host=$target \
-     >     --disable-profile --without-gd --without-cvs --enable-add-ons
-+
-+Note the additional '--with-kconfig' option. This tells EGLIBC where to
-+find the host config tools used by the kernel 'make config' and 'make
-+menuconfig'.  These tools can be re-used by EGLIBC for its own 'make
-+*config' support, which will create 'option-groups.config' for you.
-+But first make sure those tools have been built by running some
-+dummy 'make *config' calls in the kernel directory:
-+
-+    $ cd $obj/linux
-+    $ PATH=$tools/bin:$PATH make config \
-+    >      ARCH=$linux_arch CROSS_COMPILE=$target- \
-+    $ PATH=$tools/bin:$PATH make menuconfig \
-+    >      ARCH=$linux_arch CROSS_COMPILE=$target- \
-+
-+Now we can configure and build the full EGLIBC:
-+
-+    $ cd $obj/eglibc
-+    $ PATH=$tools/bin:$PATH make defconfig
-+    $ PATH=$tools/bin:$PATH make menuconfig
-     $ PATH=$tools/bin:$PATH make
-     $ PATH=$tools/bin:$PATH make install install_root=$sysroot
- 
-Index: libc/configure.in
-===================================================================
---- libc.orig/configure.in	2012-09-05 21:40:19.000000000 -0700
-+++ libc/configure.in	2012-09-05 21:44:09.769577577 -0700
-@@ -96,6 +96,16 @@
- 	    [sysheaders=$withval],
- 	    [sysheaders=''])
- 
-+AC_ARG_WITH([kconfig],
-+	    AC_HELP_STRING([--with-kconfig=PATH],
-+			   [location of kconfig tools to use (from Linux
-+			    kernel builds) to re-use for configuring EGLIBC
-+			    option groups]),
-+	    [KCONFIG_TOOLS=$withval],
-+	    [KCONFIG_TOOLS=''])
-+AC_SUBST(KCONFIG_TOOLS)
-+
-+
- AC_SUBST(use_default_link)
- AC_ARG_WITH([default-link],
- 	    AC_HELP_STRING([--with-default-link],
-Index: libc/config.make.in
-===================================================================
---- libc.orig/config.make.in	2012-08-21 22:25:55.000000000 -0700
-+++ libc/config.make.in	2012-09-05 21:45:16.253579810 -0700
-@@ -48,6 +48,8 @@
- c++-sysincludes = @CXX_SYSINCLUDES@
- all-warnings = @all_warnings@
- 
-+kconfig_tools = @KCONFIG_TOOLS@
-+
- have-z-combreloc = @libc_cv_z_combreloc@
- have-z-execstack = @libc_cv_z_execstack@
- have-Bgroup = @libc_cv_Bgroup@
-Index: libc/options-config/config-postproc.pl
-===================================================================
---- /dev/null	1970-01-01 00:00:00.000000000 +0000
-+++ libc/options-config/config-postproc.pl	2012-09-05 21:44:09.769577577 -0700
-@@ -0,0 +1,54 @@
-+#!/usr/bin/perl
-+
-+$usage = "usage: $0 <default config file> <config file>\n";
-+
-+die "$usage" unless @ARGV;
-+$defaults = shift @ARGV;
-+die "$usage" unless @ARGV;
-+die "Could not open $ARGV[0]" unless -T $ARGV[0];
-+
-+sub yank {
-+    @option = grep($_ ne $_[0], @option);
-+}
-+
-+open(DEFAULTS, $defaults) || die "Could not open $defaults\n";
-+
-+# get the full list of available options using the default config file
-+$i = 0;
-+while (<DEFAULTS>) {
-+    if (/^\s*OPTION_(\w+)\s*=/) {
-+	$option[$i++] = $1;
-+    }
-+}
-+
-+# now go through the config file, making the necessary changes
-+while (<>) {
-+    if (/Linux Kernel Configuration/) {
-+	# change title
-+	s/Linux Kernel/Option Groups/;
-+	print;
-+    } elsif (/^\s*CONFIG_(\w+)\s*=/) {
-+	# this is an explicit option set line, change CONFIG_ to OPTION_
-+	# before printing and remove this option from option list
-+	$opt = $1;
-+	yank($opt);
-+	s/CONFIG_/OPTION_/g;
-+	print;
-+    } elsif (/^\s*#\s+CONFIG_(\w+) is not set/) {
-+	# this is a comment line, change CONFIG_ to OPTION_, remove this
-+	# option from option list, and convert to explicit OPTION_FOO=n
-+	$opt = $1;
-+	yank($opt);
-+	s/CONFIG_/OPTION_/g;
-+	print "OPTION_$opt=n\n";
-+    } else {
-+	print;
-+    }
-+}
-+
-+# any options left in @options, are options that were not mentioned in
-+# the config file, and implicitly that means the option must be set =n,
-+# so do that here.
-+foreach $opt (@option) {
-+    print "OPTION_$opt=n\n";
-+}
-Index: libc/options-config/config-preproc.pl
-===================================================================
---- /dev/null	1970-01-01 00:00:00.000000000 +0000
-+++ libc/options-config/config-preproc.pl	2012-09-05 21:44:09.769577577 -0700
-@@ -0,0 +1,8 @@
-+#!/usr/bin/perl
-+
-+if (@ARGV) {
-+    while (<>) {
-+	s/OPTION_/CONFIG_/g;
-+	print;
-+    }
-+}
-Index: libc/options-config/Makefile
-===================================================================
---- /dev/null	1970-01-01 00:00:00.000000000 +0000
-+++ libc/options-config/Makefile	2012-09-05 21:44:09.769577577 -0700
-@@ -0,0 +1,55 @@
-+# ===========================================================================
-+# EGLIBC option-groups configuration targets
-+# These targets are included from top-level makefile
-+
-+ifneq ($(kconfig_tools),)
-+ifneq (no,$(PERL))
-+
-+ocdir := options-config
-+
-+OconfigDefaults     := option-groups.defaults
-+OconfigDefaults_tmp := $(common-objpfx).tmp.defconfig
-+OconfigDef          := option-groups.def
-+Oconfig             := $(common-objpfx)option-groups.config
-+Oconfig_tmp         := $(common-objpfx).tmp.config
-+
-+conf  := $(kconfig_tools)/conf
-+mconf := $(kconfig_tools)/mconf
-+
-+preproc  := $(PERL) $(ocdir)/config-preproc.pl
-+postproc := $(PERL) $(ocdir)/config-postproc.pl
-+
-+PHONY += defconfig config menuconfig
-+
-+defconfig: $(conf) $(OconfigDefaults) $(OconfigDef)
-+	rm -f $(OconfigDefaults_tmp)
-+	rm -f $(Oconfig_tmp)
-+	$(preproc) $(OconfigDefaults) > $(OconfigDefaults_tmp)
-+	KCONFIG_CONFIG=$(Oconfig_tmp) $< --defconfig=$(OconfigDefaults_tmp) \
-+				$(OconfigDef)
-+	$(postproc) $(OconfigDefaults) $(Oconfig_tmp) > $(Oconfig)
-+	rm $(Oconfig_tmp)
-+	rm $(OconfigDefaults_tmp)
-+
-+config: $(conf) $(OconfigDefaults) $(OconfigDef)
-+	rm -f $(Oconfig_tmp)
-+	$(preproc) $(wildcard $(Oconfig)) > $(Oconfig_tmp)
-+	KCONFIG_CONFIG=$(Oconfig_tmp) $< --oldaskconfig $(OconfigDef)
-+	$(postproc) $(OconfigDefaults) $(Oconfig_tmp) > $(Oconfig)
-+	rm $(Oconfig_tmp)
-+
-+menuconfig: $(mconf) $(OconfigDefaults) $(OconfigDef)
-+	rm -f $(Oconfig_tmp)
-+	$(preproc) $(wildcard $(Oconfig)) > $(Oconfig_tmp)
-+	KCONFIG_CONFIG=$(Oconfig_tmp) $< $(OconfigDef)
-+	$(postproc) $(OconfigDefaults) $(Oconfig_tmp) > $(Oconfig)
-+	rm $(Oconfig_tmp)
-+
-+# Help text used by make help
-+help:
-+	@echo  '  defconfig	  - New config with default from default config'
-+	@echo  '  config	  - Update current config utilising a line-oriented program'
-+	@echo  '  menuconfig	  - Update current config utilising a menu based program'
-+
-+endif
-+endif
-Index: libc/option-groups.defaults
-===================================================================
---- libc.orig/option-groups.defaults	2012-08-21 22:26:18.000000000 -0700
-+++ libc/option-groups.defaults	2012-09-05 21:44:09.769577577 -0700
-@@ -8,41 +8,41 @@
- # are to be changed.
- #
- # By default, all option groups are enabled.
--OPTION_EGLIBC_ADVANCED_INET6 = y
--OPTION_EGLIBC_BACKTRACE = y
--OPTION_EGLIBC_BIG_MACROS = y
--OPTION_EGLIBC_BSD = y
--OPTION_EGLIBC_CXX_TESTS = y
--OPTION_EGLIBC_CATGETS = y
--OPTION_EGLIBC_CHARSETS = y
--OPTION_EGLIBC_CRYPT = y
--OPTION_EGLIBC_CRYPT_UFC = y
--OPTION_EGLIBC_DB_ALIASES = y
--OPTION_EGLIBC_ENVZ = y
--OPTION_EGLIBC_FCVT = y
--OPTION_EGLIBC_FMTMSG = y
--OPTION_EGLIBC_FSTAB = y
--OPTION_EGLIBC_FTRAVERSE = y
--OPTION_EGLIBC_GETLOGIN = y
--OPTION_EGLIBC_IDN = y
--OPTION_EGLIBC_INET = y
--OPTION_EGLIBC_INET_ANL = y
--OPTION_EGLIBC_LIBM = y
--OPTION_EGLIBC_LIBM_BIG = y
--OPTION_EGLIBC_LOCALES = y
--OPTION_EGLIBC_LOCALE_CODE = y
--OPTION_EGLIBC_MEMUSAGE = y
--OPTION_EGLIBC_NIS = y
--OPTION_EGLIBC_NSSWITCH = y
--OPTION_EGLIBC_RCMD = y
--OPTION_EGLIBC_RTLD_DEBUG = y
--OPTION_EGLIBC_SPAWN = y
--OPTION_EGLIBC_STREAMS = y
--OPTION_EGLIBC_SUNRPC = y
--OPTION_EGLIBC_UTMP = y
--OPTION_EGLIBC_UTMPX = y
--OPTION_EGLIBC_WORDEXP = y
--OPTION_POSIX_C_LANG_WIDE_CHAR = y
--OPTION_POSIX_REGEXP = y
--OPTION_POSIX_REGEXP_GLIBC = y
--OPTION_POSIX_WIDE_CHAR_DEVICE_IO = y
-+OPTION_EGLIBC_ADVANCED_INET6=y
-+OPTION_EGLIBC_BACKTRACE=y
-+OPTION_EGLIBC_BIG_MACROS=y
-+OPTION_EGLIBC_BSD=y
-+OPTION_EGLIBC_CXX_TESTS=y
-+OPTION_EGLIBC_CATGETS=y
-+OPTION_EGLIBC_CHARSETS=y
-+OPTION_EGLIBC_CRYPT=y
-+OPTION_EGLIBC_CRYPT_UFC=y
-+OPTION_EGLIBC_DB_ALIASES=y
-+OPTION_EGLIBC_ENVZ=y
-+OPTION_EGLIBC_FCVT=y
-+OPTION_EGLIBC_FMTMSG=y
-+OPTION_EGLIBC_FSTAB=y
-+OPTION_EGLIBC_FTRAVERSE=y
-+OPTION_EGLIBC_GETLOGIN=y
-+OPTION_EGLIBC_IDN=y
-+OPTION_EGLIBC_INET=y
-+OPTION_EGLIBC_INET_ANL=y
-+OPTION_EGLIBC_LIBM=y
-+OPTION_EGLIBC_LIBM_BIG=y
-+OPTION_EGLIBC_LOCALES=y
-+OPTION_EGLIBC_LOCALE_CODE=y
-+OPTION_EGLIBC_MEMUSAGE=y
-+OPTION_EGLIBC_NIS=y
-+OPTION_EGLIBC_NSSWITCH=y
-+OPTION_EGLIBC_RCMD=y
-+OPTION_EGLIBC_RTLD_DEBUG=y
-+OPTION_EGLIBC_SPAWN=y
-+OPTION_EGLIBC_STREAMS=y
-+OPTION_EGLIBC_SUNRPC=y
-+OPTION_EGLIBC_UTMP=y
-+OPTION_EGLIBC_UTMPX=y
-+OPTION_EGLIBC_WORDEXP=y
-+OPTION_POSIX_C_LANG_WIDE_CHAR=y
-+OPTION_POSIX_REGEXP=y
-+OPTION_POSIX_REGEXP_GLIBC=y
-+OPTION_POSIX_WIDE_CHAR_DEVICE_IO=y
-Index: libc/option-groups.def
-===================================================================
---- libc.orig/option-groups.def	2012-08-21 22:25:45.000000000 -0700
-+++ libc/option-groups.def	2012-09-05 21:44:09.773577578 -0700
-@@ -4,19 +4,19 @@
- #
- # An entry of the form:
- #
--#   config OPTION_GROUP_NAME
-+#   config GROUP_NAME
- #       bool "one-line explanation of what this option group controls"
- #       help
- #           Multi-line help explaining the option group's meaning in
- #           some detail, terminated by indentation level.
- #
--# defines an option group whose variable is OPTION_GROUP_NAME, with
-+# defines an option group whose variable is GROUP_NAME, with
- # meaningful values 'y' (enabled) and 'n' (disabled).  The
- # documentation is formatted to be consumed by some sort of
- # interactive configuration interface, but EGLIBC doesn't have such an
- # interface yet.
- #
--# An option may have a 'depends' line, indicating which other options
-+# An option may have a 'depends on' line, indicating which other options
- # must also be enabled if this option is.  At present, EGLIBC doesn't
- # check that these dependencies are satisfied.
- # 
-@@ -41,9 +41,9 @@
- # although this simply reestablishes the value already set by
- # 'option-groups.defaults'.
- 
--config OPTION_EGLIBC_ADVANCED_INET6
-+config EGLIBC_ADVANCED_INET6
-    bool "IPv6 Advanced Sockets API support (RFC3542)"
--   depends OPTION_EGLIBC_INET
-+   depends on EGLIBC_INET
-    help
-        This option group includes the functions specified by RFC 3542,
-        "Advanced Sockets Application Program Interface (API) for
-@@ -71,7 +71,7 @@
-          inet6_rth_segments
-          inet6_rth_space
- 
--config OPTION_EGLIBC_BACKTRACE
-+config EGLIBC_BACKTRACE
-    bool "Functions for producing backtraces"
-    help
-        This option group includes functions for producing a list of
-@@ -85,7 +85,7 @@
-          backtrace_symbols
-          backtrace_symbols_fd
- 
--config OPTION_EGLIBC_BIG_MACROS
-+config EGLIBC_BIG_MACROS
-    bool "Use extensive inline code"
-    help
-        This option group specifies whether certain pieces of code
-@@ -93,7 +93,7 @@
-        group is not selected, function calls will be used instead,
-        hence reducing the library footprint.
- 
--config OPTION_EGLIBC_BSD
-+config EGLIBC_BSD
-    bool "BSD-specific functions, and their compatibility stubs"
-    help
-        This option group includes functions specific to BSD kernels.
-@@ -109,10 +109,9 @@
-          revoke
-          setlogin
- 
--config OPTION_EGLIBC_CXX_TESTS
-+config EGLIBC_CXX_TESTS
-    bool "Tests that link against the standard C++ library."
--   depends OPTION_POSIX_WIDE_CHAR_DEVICE_IO
--   depends OPTION_EGLIBC_LIBM
-+   depends on POSIX_WIDE_CHAR_DEVICE_IO && EGLIBC_LIBM
-    help
-        This option group does not include any C library functions;
-        instead, it controls which EGLIBC tests an ordinary 'make
-@@ -121,23 +120,22 @@
-        run.
- 
-        The standard C++ library depends on the math library 'libm' and
--       the wide character I/O functions included in EGLIBC.  If those
--       option groups are disabled, this test must also be disabled.
-+       the wide character I/O functions included in EGLIBC.  So those
-+       option groups must be enabled if this test is enabled.
- 
--config OPTION_EGLIBC_CATGETS
-+config EGLIBC_CATGETS
-    bool "Functions for accessing message catalogs"
--   depends OPTION_EGLIBC_LOCALE_CODE
-+   depends on 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.
-+       This option group depends on the EGLIBC_LOCALE_CODE
-+       option group.
- 
--config OPTION_EGLIBC_CHARSETS
-+config EGLIBC_CHARSETS
-    bool "iconv/gconv character set conversion libraries"
-    help
--
-        This option group includes support for character sets other
-        than ASCII (ANSI_X3.4-1968) and Unicode and ISO-10646 in their
-        various encodings.  This affects both the character sets
-@@ -198,16 +196,16 @@
-           WCHAR_T           - EGLIBC's internal form (target-endian,
-                               32-bit ISO 10646)
- 
--config OPTION_EGLIBC_CRYPT
-+config EGLIBC_CRYPT
-    bool "Encryption library"
-    help
-        This option group includes the `libcrypt' library which
-        provides functions for one-way encryption.  Supported
-        encryption algorithms include MD5, SHA-256, SHA-512 and DES.
- 
--config OPTION_EGLIBC_CRYPT_UFC
-+config EGLIBC_CRYPT_UFC
-    bool "Ultra fast `crypt' implementation"
--   depends OPTION_EGLIBC_CRYPT
-+   depends on EGLIBC_CRYPT
-    help
-        This option group provides ultra fast DES-based implementation of
-        the `crypt' function.  When this option group is disabled,
-@@ -216,7 +214,7 @@
-        errno to ENOSYS if /salt/ passed does not correspond to either MD5,
-        SHA-256 or SHA-512 algorithm.
- 
--config OPTION_EGLIBC_DB_ALIASES
-+config EGLIBC_DB_ALIASES
-    bool "Functions for accessing the mail aliases database"
-    help
-        This option group includues functions for looking up mail
-@@ -233,7 +231,7 @@
-        When this option group is disabled, the NSS service libraries
-        also lack support for querying their mail alias tables.
- 
--config OPTION_EGLIBC_ENVZ
-+config EGLIBC_ENVZ
-    bool "Functions for handling envz-style environment vectors."
-    help
-        This option group contains functions for creating and operating
-@@ -248,7 +246,7 @@
-         envz_entry      envz_remove
-         envz_get        envz_strip 
- 
--config OPTION_EGLIBC_FCVT
-+config EGLIBC_FCVT
-    bool "Functions for converting floating-point numbers to strings"
-    help
-        This option group includes functions for converting
-@@ -262,14 +260,14 @@
- 	 fcvt_r		qfcvt_r
-          gcvt		qgcvt
- 
--config OPTION_EGLIBC_FMTMSG
-+config EGLIBC_FMTMSG
-    bool "Functions for formatting messages"
-    help
-        This option group includes the following functions:
- 
-          addseverity    fmtmsg
- 
--config OPTION_EGLIBC_FSTAB
-+config EGLIBC_FSTAB
-    bool "Access functions for 'fstab'"
-    help
-        This option group includes functions for reading the mount
-@@ -283,7 +281,7 @@
-          getfsent       setfsent
-          getfsfile
- 
--config OPTION_EGLIBC_FTRAVERSE
-+config EGLIBC_FTRAVERSE
-    bool "Functions for traversing file hierarchies"
-    help
-        This option group includes functions for traversing file
-@@ -297,9 +295,9 @@
- 	 fts_set	nftw64
-          fts_close
- 
--config OPTION_EGLIBC_GETLOGIN
-+config EGLIBC_GETLOGIN
-    bool "The getlogin function"
--   depends OPTION_EGLIBC_UTMP
-+   depends on EGLIBC_UTMP
-    help
-        This function group includes the 'getlogin' and 'getlogin_r'
-        functions, which return the user name associated by the login
-@@ -309,17 +307,17 @@
-        fall back on 'getlogin' to find the user's login name for tilde
-        expansion when the 'HOME' environment variable is not set.
- 
--config OPTION_EGLIBC_IDN
-+config EGLIBC_IDN
-    bool "International domain names support"
-    help
-        This option group includes the `libcidn' library which
-        provides support for international domain names.
- 
--config OPTION_EGLIBC_INET
-+config EGLIBC_INET
-    bool "Networking support"
-    help
-        This option group includes networking-specific functions and
--       data.  With OPTION_EGLIBC_INET disabled, the EGLIBC
-+       data.  With EGLIBC_INET disabled, the EGLIBC
-        installation and API changes as follows:
- 
-        - The following libraries are not installed:
-@@ -439