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

glibc: switch to downloading version 2.22 via tarball instead of git to improve mirror support

Browse Source 
Signed-off-by: Felix Fietkau <nbd@openwrt.org>

SVN-Revision: 48556
This commit is contained in:
Felix Fietkau
2016-01-29 23:19:31 +00:00
parent b26d52d980
commit 3e9d2a847b
2 changed files with 13 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
toolchain/glibc/Config.version
View File

@@ -20,7 +20,6 @@ config GLIBC_REVISION
string string
default "25243" if EGLIBC_VERSION_2_19 default "25243" if EGLIBC_VERSION_2_19
default "4e42b5b8f8" if GLIBC_VERSION_2_21 default "4e42b5b8f8" if GLIBC_VERSION_2_21
default "78bd7499af" if GLIBC_VERSION_2_22
default "" default ""
endif endif

19
toolchain/glibc/common.mk
View File

@@ -8,13 +8,20 @@ include $(TOPDIR)/rules.mk
PKG_NAME:=glibc PKG_NAME:=glibc
PKG_VERSION:=$(call qstrip,$(CONFIG_GLIBC_VERSION)) PKG_VERSION:=$(call qstrip,$(CONFIG_GLIBC_VERSION))
PKG_REVISION:=$(call qstrip,$(CONFIG_GLIBC_REVISION))
PKG_SOURCE_PROTO:=git ifeq ($(PKG_VERSION),2.22)
PKG_SOURCE_URL:=git://sourceware.org/git/glibc.git PKG_SOURCE_URL:=http://ftpmirror.gnu.org/libc
PKG_SOURCE_VERSION:=$(PKG_REVISION) PKG_MD5SUM:=eb731406903befef1d8f878a46be75ef862b9056ab0cde1626d08a7a05328948
PKG_SOURCE_SUBDIR:=$(PKG_NAME)-$(PKG_VERSION)-r$(PKG_REVISION) PKG_SOURCE_SUBDIR:=$(PKG_NAME)-$(PKG_VERSION)
PKG_SOURCE:=$(PKG_SOURCE_SUBDIR).tar.bz2 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:= GLIBC_PATH:=
ifneq ($(CONFIG_EGLIBC_VERSION_2_19),) ifneq ($(CONFIG_EGLIBC_VERSION_2_19),)