remove special treatment when using glibc - support got dropped
authorMirko Vogt <mirko@openwrt.org>
Sat, 28 Apr 2012 22:24:16 +0000 (22:24 +0000)
committerMirko Vogt <mirko@openwrt.org>
Sat, 28 Apr 2012 22:24:16 +0000 (22:24 +0000)
SVN-Revision: 31504

package/base-files/Makefile
package/hotplug2/Makefile

index b22e6b3..78ece51 100644 (file)
@@ -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)/
index a003622..e8483dd 100644 (file)
@@ -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