Author: nbd Date: 2016-01-20 20:12:01 +0100 (Wed, 20 Jan 2016) New Revision: 48399
Modified: trunk/package/libs/toolchain/Makefile trunk/toolchain/glibc/common.mk Log: toolchain: Reverse glibc/eglibc conditionals to check for eglibc This will make adding future glibc versions easier because the conditionals won't have to be modified again. Signed-off-by: Michael Marley <[email protected]> Modified: trunk/package/libs/toolchain/Makefile =================================================================== --- trunk/package/libs/toolchain/Makefile 2016-01-20 19:11:48 UTC (rev 48398) +++ trunk/package/libs/toolchain/Makefile 2016-01-20 19:12:01 UTC (rev 48399) @@ -366,9 +366,9 @@ $(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)/ Modified: trunk/toolchain/glibc/common.mk =================================================================== --- trunk/toolchain/glibc/common.mk 2016-01-20 19:11:48 UTC (rev 48398) +++ trunk/toolchain/glibc/common.mk 2016-01-20 19:12:01 UTC (rev 48399) @@ -72,10 +72,10 @@ define Host/SetToolchainInfo $(SED) 's,^\(LIBC_TYPE\)=.*,\1=$(PKG_NAME),' $(TOOLCHAIN_DIR)/info.mk -ifneq ($(CONFIG_GLIBC_VERSION_2_21),) +ifneq ($(CONFIG_EGLIBC_VERSION_2_19),) + $(SED) 's,^\(LIBC_URL\)=.*,\1=http://www.eglibc.org/,' $(TOOLCHAIN_DIR)/info.mk +else $(SED) 's,^\(LIBC_URL\)=.*,\1=http://www.gnu.org/software/libc/,' $(TOOLCHAIN_DIR)/info.mk -else - $(SED) 's,^\(LIBC_URL\)=.*,\1=http://www.eglibc.org/,' $(TOOLCHAIN_DIR)/info.mk endif $(SED) 's,^\(LIBC_VERSION\)=.*,\1=$(PKG_VERSION),' $(TOOLCHAIN_DIR)/info.mk $(SED) 's,^\(LIBC_SO_VERSION\)=.*,\1=$(PKG_VERSION),' $(TOOLCHAIN_DIR)/info.mk @@ -97,7 +97,7 @@ define Host/Prepare $(call Host/Prepare/Default) ln -snf $(PKG_SOURCE_SUBDIR) $(BUILD_DIR_TOOLCHAIN)/$(PKG_NAME) -ifeq ($(CONFIG_GLIBC_VERSION_2_21)$(CONFIG_GLIBC_VERSION_2_22),) +ifneq ($(CONFIG_EGLIBC_VERSION_2_19),) $(SED) 's,y,n,' $(HOST_BUILD_DIR)/libc/option-groups.defaults endif endef _______________________________________________ openwrt-commits mailing list [email protected] https://lists.openwrt.org/cgi-bin/mailman/listinfo/openwrt-commits
