domenico/openwrt_NSS_ACW
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

toolchain: Reverse glibc/eglibc conditionals to check for eglibc

Browse Source 
This will make adding future glibc versions easier because the
conditionals won't have to be modified again.

Signed-off-by: Michael Marley <michael@michaelmarley.com>

SVN-Revision: 48399
This commit is contained in:
Felix Fietkau
2016-01-20 19:12:01 +00:00
parent 35a17334eb
commit 1981ee7d75
2 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
package/libs/toolchain/Makefile
View File

@@ -366,9 +366,9 @@ ifeq ($(CONFIG_EXTERNAL_TOOLCHAIN),)
$(CP) $(TOOLCHAIN_DIR)/lib/libstdc++.so.* $(1)/usr/lib/
endef
use_libutil=$(if $(CONFIG_GLIBC_USE_VERSION_2_21)$(CONFIG_GLIBC_USE_VERSION_2_22)$(CONFIG_EGLIBC_OPTION_EGLIBC_UTMP),libutil)
use_libnsl=$(if $(CONFIG_GLIBC_USE_VERSION_2_21)$(CONFIG_GLIBC_USE_VERSION_2_22)$(CONFIG_EGLIBC_OPTION_EGLIBC_NIS),libnsl)
use_nsswitch=$(if $(CONFIG_GLIBC_USE_VERSION_2_21)$(CONFIG_GLIBC_USE_VERSION_2_22)$(CONFIG_EGLIBC_OPTION_EGLIBC_NSSWITCH),libnss_dns libnss_files)
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)/