glibc: fix applying of patches

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

diff --git a/toolchain/glibc/common.mk b/toolchain/glibc/common.mk
index 12666ac6ff018f4f2f48790894df5f5aeb54117c..090901e27f2336a005855194bc3b0555a4ce2d44 100644 (file)
--- a/toolchain/glibc/common.mk
+++ b/toolchain/glibc/common.mk
@@ -7,22 +7,16 @@
 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_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:=
-
-PATCH_DIR:=$(PATH_PREFIX)/patches/$(PKG_VERSION)
+PKG_SOURCE_URL:=@GNU/libc
+PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.xz
+PKG_HASH:=e54e0a934cd2bc94429be79da5e9385898d2306b9eaf3c92d5a77af96190f6bd
 
+PKG_SOURCE_SUBDIR:=$(PKG_NAME)-$(PKG_VERSION)
 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
 
@@ -79,7 +73,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; \
        }