From 3e2f57835342074a90843077c1c63c88a42e6217 Mon Sep 17 00:00:00 2001 From: John Crispin Date: Thu, 12 Mar 2015 19:50:57 +0000 Subject: toolchain: The glorious return of glibc, ver 2.21 It's the eglibc packaging with a bit of spit-polishing. And testing. :-) [blogic: merged glibc and eglibc into 1 and made eglibc a glibc variant] Signed-off-by: Jeff Waugh Signed-off-by: John Crispin SVN-Revision: 44701 --- package/libs/toolchain/Makefile | 10 +++++----- package/libs/toolchain/glibc-files/etc/nsswitch.conf | 13 +++++++++++++ 2 files changed, 18 insertions(+), 5 deletions(-) create mode 100644 package/libs/toolchain/glibc-files/etc/nsswitch.conf (limited to 'package') diff --git a/package/libs/toolchain/Makefile b/package/libs/toolchain/Makefile index 42b9935148..a3f8a9f6fb 100644 --- a/package/libs/toolchain/Makefile +++ b/package/libs/toolchain/Makefile @@ -420,12 +420,12 @@ ifeq ($(CONFIG_EXTERNAL_TOOLCHAIN),) $(CP) $(TOOLCHAIN_DIR)/lib/libstdc++.so.* $(1)/usr/lib/ endef - use_libutil=$(if $(CONFIG_EGLIBC_OPTION_EGLIBC_UTMP),libutil) - use_libnsl=$(if $(CONFIG_EGLIBC_OPTION_EGLIBC_NIS),libnsl) - use_nsswitch=$(if $(CONFIG_EGLIBC_OPTION_EGLIBC_NSSWITCH),libnss_dns libnss_files) + use_libutil=$(if $(CONFIG_GLIBC_USE_VERSION_2_21)$(CONFIG_EGLIBC_OPTION_EGLIBC_UTMP),libutil) + use_libnsl=$(if $(CONFIG_GLIBC_USE_VERSION_2_21)$(CONFIG_EGLIBC_OPTION_EGLIBC_NIS),libnsl) + use_nsswitch=$(if $(CONFIG_GLIBC_USE_VERSION_2_21)$(CONFIG_EGLIBC_OPTION_EGLIBC_NSSWITCH),libnss_dns libnss_files) - define Package/eglibc/install - $(CP) ./eglibc-files/* $(1)/ + define Package/glibc/install + $(CP) ./glibc-files/* $(1)/ rm -f $(1)/etc/localtime $(LN) /tmp/localtime $(1)/etc/localtime $(INSTALL_DIR) $(1)/lib diff --git a/package/libs/toolchain/glibc-files/etc/nsswitch.conf b/package/libs/toolchain/glibc-files/etc/nsswitch.conf new file mode 100644 index 0000000000..981c425da6 --- /dev/null +++ b/package/libs/toolchain/glibc-files/etc/nsswitch.conf @@ -0,0 +1,13 @@ +passwd:files +shadow:files +group:files +hosts:dns files +bootparams:files +ethers:files +netmasks:files +networks:files +protocols:files +rpc:files +services:files +automount:files +aliases:files -- cgit v1.2.3