aboutsummaryrefslogtreecommitdiffstats
path: root/package
diff options
context:
space:
mode:
authorFelix Fietkau <nbd@openwrt.org>2016-02-25 13:43:46 +0000
committerFelix Fietkau <nbd@openwrt.org>2016-02-25 13:43:46 +0000
commit64da662a88aafb7f8a1637fa0e29118445e98252 (patch)
treec601855bdfed4512539d079ef062803f41cede21 /package
parent5be9e97a82e019f91fabf6b3e6998d07ecad81bc (diff)
downloadupstream-64da662a88aafb7f8a1637fa0e29118445e98252.tar.gz
upstream-64da662a88aafb7f8a1637fa0e29118445e98252.tar.bz2
upstream-64da662a88aafb7f8a1637fa0e29118445e98252.zip
toolchain/glibc: remove obsolete versions
Signed-off-by: Felix Fietkau <nbd@openwrt.org> SVN-Revision: 48780
Diffstat (limited to 'package')
-rw-r--r--package/libs/toolchain/Makefile6
-rw-r--r--package/utils/lua/Makefile6
2 files changed, 1 insertions, 11 deletions
diff --git a/package/libs/toolchain/Makefile b/package/libs/toolchain/Makefile
index b54128fe38..120193ad50 100644
--- a/package/libs/toolchain/Makefile
+++ b/package/libs/toolchain/Makefile
@@ -366,10 +366,6 @@ ifeq ($(CONFIG_EXTERNAL_TOOLCHAIN),)
$(CP) $(TOOLCHAIN_DIR)/lib/libstdc++.so.* $(1)/usr/lib/
endef
- use_libutil=$(if $(if $(CONFIG_EGLIBC_USE_VERSION_2_19),$(CONFIG_EGLIBC_OPTION_EGLIBC_UTMP),y),libutil)
- use_libnsl=$(if $(if $(CONFIG_EGLIBC_USE_VERSION_2_19),$(CONFIG_EGLIBC_OPTION_EGLIBC_NIS),y),libnsl)
- use_nsswitch=$(if $(if $(CONFIG_EGLIBC_USE_VERSION_2_19),$(CONFIG_EGLIBC_OPTION_EGLIBC_NSSWITCH),y),libnss_dns libnss_files)
-
define Package/glibc/install
$(CP) ./glibc-files/* $(1)/
rm -f $(1)/etc/localtime
@@ -379,7 +375,7 @@ ifeq ($(CONFIG_EXTERNAL_TOOLCHAIN),)
$(TOOLCHAIN_DIR)/lib/ld*.so.* \
$(TOOLCHAIN_DIR)/lib/ld-$(LIBC_SO_VERSION).so \
$(1)/lib/
- for file in libanl libc libcidn libcrypt libdl libm $(use_libnsl) $(use_nsswitch) libresolv $(use_libutil); do \
+ for file in libanl libc libcidn libcrypt libdl libm libnsl libnss_dns libnss_files libresolv libutil; do \
for file in $(TOOLCHAIN_DIR)/lib/$$$$file.so.* $(TOOLCHAIN_DIR)/lib/$$$$file-$(LIBC_SO_VERSION).so; do \
if [ -e "$$$$file" ]; then \
$(CP) $$$$file $(1)/lib/; \
diff --git a/package/utils/lua/Makefile b/package/utils/lua/Makefile
index e741fd19e3..cf2d8877fd 100644
--- a/package/utils/lua/Makefile
+++ b/package/utils/lua/Makefile
@@ -93,12 +93,6 @@ endef
TARGET_CFLAGS += -DLUA_USE_LINUX $(FPIC) -std=gnu99
-ifneq ($(CONFIG_USE_GLIBC),)
- ifeq ($(CONFIG_EGLIBC_OPTION_EGLIBC_UTMP),)
- TARGET_CFLAGS += -DNO_GETLOGIN
- endif
-endif
-
define Build/Compile
$(MAKE) $(PKG_JOBS) -C $(PKG_BUILD_DIR) \
CC="$(TARGET_CROSS)gcc" \