mirror of
git://projects.qi-hardware.com/openwrt-xburst.git
synced 2024-12-04 11:13:45 +02:00
fix handling of eglibc config options for packaging
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@14210 3c298f89-4303-0410-b956-a3cf2f4a3e73
This commit is contained in:
parent
21c1b33aeb
commit
7132841ab1
@ -202,11 +202,15 @@ define Package/libstdcpp/install
|
|||||||
$(CP) $(TOOLCHAIN_DIR)/usr/lib$(LIB_SUFFIX)/libstdc++.so.* $(1)/usr/lib/
|
$(CP) $(TOOLCHAIN_DIR)/usr/lib$(LIB_SUFFIX)/libstdc++.so.* $(1)/usr/lib/
|
||||||
endef
|
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
|
define Package/glibc/install
|
||||||
$(INSTALL_DIR) $(1)/lib
|
$(INSTALL_DIR) $(1)/lib
|
||||||
$(CP) $(TOOLCHAIN_DIR)/lib/ld*.so.* $(1)/lib/
|
$(CP) $(TOOLCHAIN_DIR)/lib/ld*.so.* $(1)/lib/
|
||||||
$(CP) $(TOOLCHAIN_DIR)/lib/ld-$(LIBC_VERSION).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.so.* $(1)/lib/; \
|
||||||
$(CP) $(TOOLCHAIN_DIR)/lib/$$$$file-$(LIBC_VERSION).so $(1)/lib/; \
|
$(CP) $(TOOLCHAIN_DIR)/lib/$$$$file-$(LIBC_VERSION).so $(1)/lib/; \
|
||||||
done
|
done
|
||||||
|
Loading…
Reference in New Issue
Block a user