aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorFelix Fietkau <nbd@openwrt.org>2009-01-26 19:46:12 +0000
committerFelix Fietkau <nbd@openwrt.org>2009-01-26 19:46:12 +0000
commitff89285b25cd045895211e39f6fc8691935e92c8 (patch)
tree968c1a39a6207d09949b304b36d34c978e5140d0
parent8bf53faa440be2e2631cf655c0505e6134ab7ac9 (diff)
downloadupstream-ff89285b25cd045895211e39f6fc8691935e92c8.tar.gz
upstream-ff89285b25cd045895211e39f6fc8691935e92c8.tar.bz2
upstream-ff89285b25cd045895211e39f6fc8691935e92c8.zip
fix handling of eglibc config options for packaging
SVN-Revision: 14210
-rw-r--r--package/base-files/Makefile6
1 files changed, 5 insertions, 1 deletions
diff --git a/package/base-files/Makefile b/package/base-files/Makefile
index 581aa9365c..41dc310678 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