diff options
| author | Felix Fietkau <nbd@openwrt.org> | 2016-01-29 23:19:31 +0000 |
|---|---|---|
| committer | Felix Fietkau <nbd@openwrt.org> | 2016-01-29 23:19:31 +0000 |
| commit | 3e9d2a847bbbc282e82a2a92417a095ad1e21e1a (patch) | |
| tree | c850417633b070a066cd8894a6c4ffed781b695f | |
| parent | b26d52d9805ea25dce3e8ae81482c218efa9087f (diff) | |
| download | openwrt-3e9d2a847bbbc282e82a2a92417a095ad1e21e1a.tar.gz openwrt-3e9d2a847bbbc282e82a2a92417a095ad1e21e1a.tar.bz2 openwrt-3e9d2a847bbbc282e82a2a92417a095ad1e21e1a.zip | |
glibc: switch to downloading version 2.22 via tarball instead of git to improve mirror support
Signed-off-by: Felix Fietkau <nbd@openwrt.org>
SVN-Revision: 48556
| -rw-r--r-- | toolchain/glibc/Config.version | 1 | ||||
| -rw-r--r-- | toolchain/glibc/common.mk | 19 |
2 files changed, 13 insertions, 7 deletions
diff --git a/toolchain/glibc/Config.version b/toolchain/glibc/Config.version index 060587461b..99ab7fd431 100644 --- a/toolchain/glibc/Config.version +++ b/toolchain/glibc/Config.version @@ -20,7 +20,6 @@ config GLIBC_REVISION string default "25243" if EGLIBC_VERSION_2_19 default "4e42b5b8f8" if GLIBC_VERSION_2_21 - default "78bd7499af" if GLIBC_VERSION_2_22 default "" endif diff --git a/toolchain/glibc/common.mk b/toolchain/glibc/common.mk index bc50fcb69e..14063bf9df 100644 --- a/toolchain/glibc/common.mk +++ b/toolchain/glibc/common.mk @@ -8,13 +8,20 @@ include $(TOPDIR)/rules.mk 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),) |