Author: nbd Date: 2016-01-30 00:19:31 +0100 (Sat, 30 Jan 2016) New Revision: 48556
Modified: trunk/toolchain/glibc/Config.version trunk/toolchain/glibc/common.mk Log: glibc: switch to downloading version 2.22 via tarball instead of git to improve mirror support Signed-off-by: Felix Fietkau <[email protected]> Modified: trunk/toolchain/glibc/Config.version =================================================================== --- trunk/toolchain/glibc/Config.version 2016-01-29 23:19:26 UTC (rev 48555) +++ trunk/toolchain/glibc/Config.version 2016-01-29 23:19:31 UTC (rev 48556) @@ -20,7 +20,6 @@ string default "25243" if EGLIBC_VERSION_2_19 default "4e42b5b8f8" if GLIBC_VERSION_2_21 - default "78bd7499af" if GLIBC_VERSION_2_22 default "" endif Modified: trunk/toolchain/glibc/common.mk =================================================================== --- trunk/toolchain/glibc/common.mk 2016-01-29 23:19:26 UTC (rev 48555) +++ trunk/toolchain/glibc/common.mk 2016-01-29 23:19:31 UTC (rev 48556) @@ -8,13 +8,20 @@ PKG_NAME:=glibc PKG_VERSION:=$(call qstrip,$(CONFIG_GLIBC_VERSION)) -PKG_REVISION:=$(call qstrip,$(CONFIG_GLIBC_REVISION)) -PKG_SOURCE_PROTO:=git -PKG_SOURCE_URL:=git://sourceware.org/git/glibc.git -PKG_SOURCE_VERSION:=$(PKG_REVISION) -PKG_SOURCE_SUBDIR:=$(PKG_NAME)-$(PKG_VERSION)-r$(PKG_REVISION) -PKG_SOURCE:=$(PKG_SOURCE_SUBDIR).tar.bz2 +ifeq ($(PKG_VERSION),2.22) + PKG_SOURCE_URL:=http://ftpmirror.gnu.org/libc + PKG_MD5SUM:=eb731406903befef1d8f878a46be75ef862b9056ab0cde1626d08a7a05328948 + PKG_SOURCE_SUBDIR:=$(PKG_NAME)-$(PKG_VERSION) + PKG_SOURCE:=$(PKG_SOURCE_SUBDIR).tar.xz +else + PKG_REVISION:=$(call qstrip,$(CONFIG_GLIBC_REVISION)) + PKG_SOURCE_PROTO:=git + PKG_SOURCE_URL:=git://sourceware.org/git/glibc.git + PKG_SOURCE_VERSION:=$(PKG_REVISION) + PKG_SOURCE_SUBDIR:=$(PKG_NAME)-$(PKG_VERSION)-r$(PKG_REVISION) + PKG_SOURCE:=$(PKG_SOURCE_SUBDIR).tar.bz2 +endif GLIBC_PATH:= ifneq ($(CONFIG_EGLIBC_VERSION_2_19),) _______________________________________________ openwrt-commits mailing list [email protected] https://lists.openwrt.org/cgi-bin/mailman/listinfo/openwrt-commits
