From 6c0bc69bf6e1089ef0d1e76a34ad18d3d4283de8 Mon Sep 17 00:00:00 2001 From: mirko Date: Sat, 28 Apr 2012 22:24:16 +0000 Subject: [PATCH] [package/*] remove special treatment when using glibc - support got dropped git-svn-id: svn://svn.openwrt.org/openwrt/trunk@31504 3c298f89-4303-0410-b956-a3cf2f4a3e73 --- package/base-files/Makefile | 6 +++--- package/hotplug2/Makefile | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/package/base-files/Makefile b/package/base-files/Makefile index b22e6b308b..78ece51d21 100644 --- a/package/base-files/Makefile +++ b/package/base-files/Makefile @@ -512,9 +512,9 @@ ifeq ($(CONFIG_EXTERNAL_TOOLCHAIN),) $(CP) $(TOOLCHAIN_DIR)/lib/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) + use_libutil=$(if $(CONFIG_EGLIBC_OPTION_EGLIBC_UTMP),libutil) + use_libnsl=$(if $(CONFIG_EGLIBC_OPTION_EGLIBC_NIS),libnsl) + use_nsswitch=$(if $(CONFIG_EGLIBC_OPTION_EGLIBC_NSSWITCH),libnss_dns libnss_files) define Package/eglibc/install $(CP) ./eglibc-files/* $(1)/ diff --git a/package/hotplug2/Makefile b/package/hotplug2/Makefile index a003622b08..e8483ddc7e 100644 --- a/package/hotplug2/Makefile +++ b/package/hotplug2/Makefile @@ -45,7 +45,7 @@ MAKE_FLAGS += \ COPTS="$(TARGET_CFLAGS)" \ STATIC_WORKER="fork" -ifneq ($(CONFIG_USE_EGLIBC)$(CONFIG_USE_GLIBC),) +ifneq ($(CONFIG_USE_EGLIBC),) TARGET_LDFLAGS += -lbsd endif -- 2.11.0