diff options
| author | nbd <nbd@3c298f89-4303-0410-b956-a3cf2f4a3e73> | 2009-01-26 19:46:12 +0000 |
|---|---|---|
| committer | nbd <nbd@3c298f89-4303-0410-b956-a3cf2f4a3e73> | 2009-01-26 19:46:12 +0000 |
| commit | 7132841ab13a0f5cdcad6235e8193975191f14ad (patch) | |
| tree | 1cd74b9a349fdef6df725f41fca2b03c6f25d374 | |
| parent | 21c1b33aeb8165f2faa95eb30b852fc9014231af (diff) | |
fix handling of eglibc config options for packaging
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@14210 3c298f89-4303-0410-b956-a3cf2f4a3e73
| -rw-r--r-- | package/base-files/Makefile | 6 |
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 |