toolchain: The glorious return of glibc, ver 2.21

[openwrt/staging/noltari.git] / package / libs / toolchain / Makefile

diff --git a/package/libs/toolchain/Makefile b/package/libs/toolchain/Makefile
index 1a75e90c30f223136302e35703ed10af9b47d9bc..a3f8a9f6fbdcf2016583e71435ab9524a9c4ab5d 100644 (file)
--- 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
@@ -604,6 +604,15 @@ else
        exit 0
   endef
 
+  define Package/libatomic/install
+       for file in $(call qstrip,$(CONFIG_LIBATOMIC_FILE_SPEC)); do \
+               dir=`dirname $$$$file` ; \
+               $(INSTALL_DIR) $(1)/$$$$dir ; \
+               $(CP) $(call qstrip,$(CONFIG_LIBATOMIC_ROOT_DIR))/$$$$file $(1)/$$$$dir/ ; \
+       done ; \
+       exit 0
+  endef
+
   define Package/ldd/install
        for file in $(call qstrip,$(CONFIG_LDD_FILE_SPEC)); do \
                dir=`dirname $$$$file` ; \