aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMirko Vogt <mirko@openwrt.org>2012-04-28 22:24:16 +0000
committerMirko Vogt <mirko@openwrt.org>2012-04-28 22:24:16 +0000
commit893dfb755155f421f2897dd667af3f4dc7913cab (patch)
tree68faf13c77c7d165abbd4f8f49c2fba375c53f63
parent3b19d53edd512d871709f3a3c39b7c7c9d0f8f03 (diff)
downloadupstream-893dfb755155f421f2897dd667af3f4dc7913cab.tar.gz
upstream-893dfb755155f421f2897dd667af3f4dc7913cab.tar.bz2
upstream-893dfb755155f421f2897dd667af3f4dc7913cab.zip
[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
-rw-r--r--package/base-files/Makefile6
-rw-r--r--package/hotplug2/Makefile2
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