glibc: update glibc to 2.26+ and switch to download from git

[openwrt/openwrt.git] / toolchain / glibc / common.mk

diff --git a/toolchain/glibc/common.mk b/toolchain/glibc/common.mk
index 26e2376bfcc6d75dc4ccf98aaa46c5a14b97997f..b10e797de661723a2a8de8aa57a3100ad3e23da5 100644 (file)
--- a/toolchain/glibc/common.mk
+++ b/toolchain/glibc/common.mk
@@ -7,20 +7,18 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=glibc
-PKG_VERSION:=2.24
-PKG_REVISION:=8c716c2
-PKG_MIRROR_HASH:=714d26c0daf6a8acf73fc8b6053349880c79f240f96ca57b00ab0ecbbead2b73
+PKG_VERSION:=2.26
 
 PKG_SOURCE_PROTO:=git
+PKG_SOURCE_SUBDIR:=$(PKG_NAME)-$(PKG_VERSION)
+PKG_SOURCE_VERSION:=d300041c533a3d837c9f37a099bcc95466860e98
+PKG_MIRROR_HASH:=31e90926a1d3093355aa85c04c68b3d109c3dc3d9f80afe50505e864b32ac784
 PKG_SOURCE_URL:=git://sourceware.org/git/glibc.git
-PKG_SOURCE_VERSION:=$(PKG_REVISION)
-PKG_SOURCE_SUBDIR:=$(PKG_NAME)-$(PKG_VERSION)-$(PKG_REVISION)
-PKG_SOURCE:=$(PKG_SOURCE_SUBDIR).tar.bz2
-
-GLIBC_PATH:=
+PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-$(PKG_SOURCE_VERSION).tar.xz
 
 HOST_BUILD_DIR:=$(BUILD_DIR_TOOLCHAIN)/$(PKG_SOURCE_SUBDIR)
 CUR_BUILD_DIR:=$(HOST_BUILD_DIR)-$(VARIANT)
+PATCH_DIR:=$(PATH_PREFIX)/patches
 
 include $(INCLUDE_DIR)/toolchain-build.mk
 
@@ -77,7 +75,7 @@ endef
 
 define Host/Configure
        [ -f $(HOST_BUILD_DIR)/.autoconf ] || { \
-               cd $(HOST_BUILD_DIR)/$(GLIBC_PATH); \
+               cd $(HOST_BUILD_DIR)/; \
                autoconf --force && \
                touch $(HOST_BUILD_DIR)/.autoconf; \
        }