X-Git-Url: http://git.openwrt.org/?a=blobdiff_plain;f=toolchain%2Fglibc%2Fcommon.mk;fp=toolchain%2Fglibc%2Fcommon.mk;h=bc50fcb69eaf9f529088e9cdd2181173649babe3;hb=d542b651ccbfe0cc922558b44d5972004c83f9b9;hp=052050576a041cbd4c360d7f8e418a8fd485b388;hpb=4c93f324b54cc000cc56f9fd6005245e8e82cd54;p=openwrt%2Fsvn-archive%2Farchive.git diff --git a/toolchain/glibc/common.mk b/toolchain/glibc/common.mk index 052050576a..bc50fcb69e 100644 --- a/toolchain/glibc/common.mk +++ b/toolchain/glibc/common.mk @@ -72,10 +72,10 @@ export HOST_CFLAGS := $(HOST_CFLAGS) -idirafter $(CURDIR)/$(PATH_PREFIX)/include define Host/SetToolchainInfo $(SED) 's,^\(LIBC_TYPE\)=.*,\1=$(PKG_NAME),' $(TOOLCHAIN_DIR)/info.mk -ifneq ($(CONFIG_GLIBC_VERSION_2_21),) - $(SED) 's,^\(LIBC_URL\)=.*,\1=http://www.gnu.org/software/libc/,' $(TOOLCHAIN_DIR)/info.mk -else +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 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 @@ endef 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