From: Felix Fietkau <nbd@openwrt.org>
Date: Mon, 26 Jan 2009 19:46:12 +0000 (+0000)
Subject: fix handling of eglibc config options for packaging
X-Git-Tag: reboot~24679
X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=ff89285b25cd045895211e39f6fc8691935e92c8;p=openwrt%2Fstaging%2Fblogic.git

fix handling of eglibc config options for packaging

SVN-Revision: 14210
---

diff --git a/package/base-files/Makefile b/package/base-files/Makefile
index 581aa9365c61..41dc3106786c 100644
--- a/package/base-files/Makefile
+++ b/package/base-files/Makefile
@@ -202,11 +202,15 @@ define Package/libstdcpp/install
 	$(CP) $(TOOLCHAIN_DIR)/usr/lib$(LIB_SUFFIX)/libstdc++.so.* $(1)/usr/lib/
 endef
 
+use_libutil=$(if $(CONFIG_USE_GLIBC)$(CONFIG_EGLIBC_OPTION_EGLIBC_UTMP),libutil)
+use_libnsl=$(if $(CONFIG_USE_GLIBC)$(CONFIG_EGLIBC_OPTION_EGLIBC_NIS),libnsl)
+use_nsswitch=$(if $(CONFIG_USE_GLIBC)$(CONFIG_EGLIBC_OPTION_EGLIBC_NSSWITCH),libnss_dns libnss_files)
+
 define Package/glibc/install
 	$(INSTALL_DIR) $(1)/lib
 	$(CP) $(TOOLCHAIN_DIR)/lib/ld*.so.* $(1)/lib/
 	$(CP) $(TOOLCHAIN_DIR)/lib/ld-$(LIBC_VERSION).so $(1)/lib/
-	for file in libanl libc libcidn libcrypt libdl libm libnsl libnss_dns libnss_files libresolv libutil; do \
+	for file in libanl libc libcidn libcrypt libdl libm $(use_libnsl) $(use_nsswitch) libresolv $(use_libutil); do \
 		$(CP) $(TOOLCHAIN_DIR)/lib/$$$$file.so.* $(1)/lib/; \
 		$(CP) $(TOOLCHAIN_DIR)/lib/$$$$file-$(LIBC_VERSION).so $(1)/lib/; \
 	done