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

toolchain: use latest glibc 2.21 and 2.22 revisions

Browse Source 
Refresh patches and rework Makefile to fetch glibc from release branches
instead of relying on tarballs.

Signed-off-by: Jo-Philipp Wich <jow@openwrt.org>

SVN-Revision: 48735
This commit is contained in:
Jo-Philipp Wich
2016-02-17 08:44:49 +00:00
parent 83cdf72271
commit 5445a2ee1d
4 changed files with 22 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
toolchain/glibc/Config.version
View File

@@ -16,12 +16,6 @@ config GLIBC_VERSION_2_22
default y if !TOOLCHAINOPTS default y if !TOOLCHAINOPTS
bool bool
config GLIBC_REVISION
string
default "25243" if EGLIBC_VERSION_2_19
default "4e42b5b8f8" if GLIBC_VERSION_2_21
default ""
endif endif
menu "eglibc configuration" menu "eglibc configuration"

26
toolchain/glibc/common.mk
View File

@@ -1,27 +1,33 @@
# #
# Copyright (C) 2006-2011 OpenWrt.org # Copyright (C) 2006-2016 OpenWrt.org
# #
# This is free software, licensed under the GNU General Public License v2. # This is free software, licensed under the GNU General Public License v2.
# See /LICENSE for more information. # See /LICENSE for more information.
# #
include $(TOPDIR)/rules.mk include $(TOPDIR)/rules.mk
MD5SUM_2.19 = 42dad4edd3bcb38006d13b5640b00b38
REVISION_2.19 = 25243
MD5SUM_2.21 = 76050a65c444d58b5c4aa0d6034736ed
REVISION_2.21 = 16d0a0c
MD5SUM_2.22 = b575850e77b37d70f96472285290b391
REVISION_2.22 = b995d95
PKG_NAME:=glibc PKG_NAME:=glibc
PKG_VERSION:=$(call qstrip,$(CONFIG_GLIBC_VERSION)) PKG_VERSION:=$(call qstrip,$(CONFIG_GLIBC_VERSION))
ifeq ($(PKG_VERSION),2.22) PKG_REVISION:=$(REVISION_$(PKG_VERSION))
PKG_SOURCE_URL:=http://ftpmirror.gnu.org/libc PKG_MIRROR_MD5SUM:=$(MD5SUM_$(PKG_VERSION))
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_PROTO:=git
PKG_SOURCE_URL:=git://sourceware.org/git/glibc.git PKG_SOURCE_URL:=git://sourceware.org/git/glibc.git
PKG_SOURCE_VERSION:=$(PKG_REVISION) PKG_SOURCE_VERSION:=$(PKG_REVISION)
PKG_SOURCE_SUBDIR:=$(PKG_NAME)-$(PKG_VERSION)-r$(PKG_REVISION) PKG_SOURCE_SUBDIR:=$(PKG_NAME)-$(PKG_VERSION)-$(PKG_REVISION)
PKG_SOURCE:=$(PKG_SOURCE_SUBDIR).tar.bz2 PKG_SOURCE:=$(PKG_SOURCE_SUBDIR).tar.bz2
endif
GLIBC_PATH:= GLIBC_PATH:=
ifneq ($(CONFIG_EGLIBC_VERSION_2_19),) ifneq ($(CONFIG_EGLIBC_VERSION_2_19),)

2
toolchain/glibc/patches/2.21/200-add-dl-search-paths.patch
View File

@@ -2,7 +2,7 @@ add /usr/lib to default search path for the dynamic linker
--- a/Makeconfig --- a/Makeconfig
+++ b/Makeconfig +++ b/Makeconfig
@@ -501,6 +501,9 @@ else @@ -499,6 +499,9 @@ else
default-rpath = $(libdir) default-rpath = $(libdir)
endif endif

2
toolchain/glibc/patches/2.22/200-add-dl-search-paths.patch
View File

@@ -2,7 +2,7 @@ add /usr/lib to default search path for the dynamic linker
--- a/Makeconfig --- a/Makeconfig
+++ b/Makeconfig +++ b/Makeconfig
@@ -501,6 +501,9 @@ else @@ -527,6 +527,9 @@ else
default-rpath = $(libdir) default-rpath = $(libdir)
endif endif