|
@@ -1,35 +1,3 @@
|
|
|
-From a0a6bb9222ee234154997df5d78fc0e1b687329e Mon Sep 17 00:00:00 2001
|
|
|
-From: Reinhard Russinger <reinhard@russinger.at>
|
|
|
-Date: Sat, 17 Apr 2021 08:50:17 +0000
|
|
|
-Subject: [PATCH] revert to glibc 2.30 due to time64 issues
|
|
|
-
|
|
|
----
|
|
|
- .../glibc.hash | 7 +++++++
|
|
|
- .../glibc.hash | 7 +++++++
|
|
|
- .../glibc.hash | 7 -------
|
|
|
- .../glibc.hash | 7 -------
|
|
|
- package/glibc/arc-2019.09-release/glibc.hash | 7 +++++++
|
|
|
- package/glibc/glibc.mk | 20 ++++++++++----------
|
|
|
- 6 files changed, 31 insertions(+), 24 deletions(-)
|
|
|
- create mode 100644 package/glibc/06983fe52cfe8e4779035c27e8cc5d2caab31531/glibc.hash
|
|
|
- create mode 100644 package/glibc/2.30-67-g4748829f86a458b76642f3e98b1d80f7b868e427/glibc.hash
|
|
|
- delete mode 100644 package/glibc/2.32-37-g760e1d287825fa91d4d5a0cc921340c740d803e2/glibc.hash
|
|
|
- delete mode 100644 package/glibc/2.32.9000-69-gbd394d131c10c9ec22c6424197b79410042eed99/glibc.hash
|
|
|
- create mode 100644 package/glibc/arc-2019.09-release/glibc.hash
|
|
|
-
|
|
|
-diff --git a/package/glibc/06983fe52cfe8e4779035c27e8cc5d2caab31531/glibc.hash b/package/glibc/06983fe52cfe8e4779035c27e8cc5d2caab31531/glibc.hash
|
|
|
-new file mode 100644
|
|
|
-index 0000000..ce378c0
|
|
|
---- /dev/null
|
|
|
-+++ b/package/glibc/06983fe52cfe8e4779035c27e8cc5d2caab31531/glibc.hash
|
|
|
-@@ -0,0 +1,7 @@
|
|
|
-+# Locally calculated (fetched from Github)
|
|
|
-+sha256 703877c0df77fce00719fe55cc62b07bb8d5f44fdb704bbb1b0bf2cf38afe10a glibc-06983fe52cfe8e4779035c27e8cc5d2caab31531.tar.gz
|
|
|
-+
|
|
|
-+# Hashes for license files
|
|
|
-+sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 COPYING
|
|
|
-+sha256 dc626520dcd53a22f727af3ee42c770e56c97a64fe3adb063799d8ab032fe551 COPYING.LIB
|
|
|
-+sha256 35bdb41dc0bcb10702ddacbd51ec4c0fe6fb3129f734e8c85fc02e4d3eb0ce3f LICENSES
|
|
|
diff --git a/package/glibc/2.30-67-g4748829f86a458b76642f3e98b1d80f7b868e427/glibc.hash b/package/glibc/2.30-67-g4748829f86a458b76642f3e98b1d80f7b868e427/glibc.hash
|
|
|
new file mode 100644
|
|
|
index 0000000..6677d32
|
|
@@ -43,98 +11,16 @@ index 0000000..6677d32
|
|
|
+sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 COPYING
|
|
|
+sha256 dc626520dcd53a22f727af3ee42c770e56c97a64fe3adb063799d8ab032fe551 COPYING.LIB
|
|
|
+sha256 35bdb41dc0bcb10702ddacbd51ec4c0fe6fb3129f734e8c85fc02e4d3eb0ce3f LICENSES
|
|
|
-diff --git a/package/glibc/2.32-37-g760e1d287825fa91d4d5a0cc921340c740d803e2/glibc.hash b/package/glibc/2.32-37-g760e1d287825fa91d4d5a0cc921340c740d803e2/glibc.hash
|
|
|
-deleted file mode 100644
|
|
|
-index b1d5243..0000000
|
|
|
---- a/package/glibc/2.32-37-g760e1d287825fa91d4d5a0cc921340c740d803e2/glibc.hash
|
|
|
-+++ /dev/null
|
|
|
-@@ -1,7 +0,0 @@
|
|
|
--# Locally calculated (fetched from Github)
|
|
|
--sha256 f4710e9a435a7b83e1d23dd75434f0d36b898eba9b4249c946c32b467d852fd4 glibc-2.32-37-g760e1d287825fa91d4d5a0cc921340c740d803e2.tar.gz
|
|
|
--
|
|
|
--# Hashes for license files
|
|
|
--sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 COPYING
|
|
|
--sha256 dc626520dcd53a22f727af3ee42c770e56c97a64fe3adb063799d8ab032fe551 COPYING.LIB
|
|
|
--sha256 b33d0bd9f685b46853548814893a6135e74430d12f6d94ab3eba42fc591f83bc LICENSES
|
|
|
-diff --git a/package/glibc/2.32.9000-69-gbd394d131c10c9ec22c6424197b79410042eed99/glibc.hash b/package/glibc/2.32.9000-69-gbd394d131c10c9ec22c6424197b79410042eed99/glibc.hash
|
|
|
-deleted file mode 100644
|
|
|
-index 5585915..0000000
|
|
|
---- a/package/glibc/2.32.9000-69-gbd394d131c10c9ec22c6424197b79410042eed99/glibc.hash
|
|
|
-+++ /dev/null
|
|
|
-@@ -1,7 +0,0 @@
|
|
|
--# Locally calculated (fetched from Github)
|
|
|
--sha256 c3828224d69a42f5b6982cbec8ae01cf494fe975ce9023e36ff2c10a2fb93e42 glibc-2.32.9000-69-gbd394d131c10c9ec22c6424197b79410042eed99.tar.gz
|
|
|
--
|
|
|
--# Hashes for license files
|
|
|
--sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 COPYING
|
|
|
--sha256 dc626520dcd53a22f727af3ee42c770e56c97a64fe3adb063799d8ab032fe551 COPYING.LIB
|
|
|
--sha256 b33d0bd9f685b46853548814893a6135e74430d12f6d94ab3eba42fc591f83bc LICENSES
|
|
|
-diff --git a/package/glibc/arc-2019.09-release/glibc.hash b/package/glibc/arc-2019.09-release/glibc.hash
|
|
|
-new file mode 100644
|
|
|
-index 0000000..296035c
|
|
|
---- /dev/null
|
|
|
-+++ b/package/glibc/arc-2019.09-release/glibc.hash
|
|
|
-@@ -0,0 +1,7 @@
|
|
|
-+# Locally calculated (fetched from Github)
|
|
|
-+sha256 0e0fd7603938fd8ebd793385a3d72c6e1fba22e16a600a16cc953a93f0e85943 glibc-arc-2019.09-release.tar.gz
|
|
|
-+
|
|
|
-+# Hashes for license files
|
|
|
-+sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 COPYING
|
|
|
-+sha256 dc626520dcd53a22f727af3ee42c770e56c97a64fe3adb063799d8ab032fe551 COPYING.LIB
|
|
|
-+sha256 35bdb41dc0bcb10702ddacbd51ec4c0fe6fb3129f734e8c85fc02e4d3eb0ce3f LICENSES
|
|
|
diff --git a/package/glibc/glibc.mk b/package/glibc/glibc.mk
|
|
|
-index f84f670..4621c9c 100644
|
|
|
+index 1eff245..29b9fad 100644
|
|
|
--- a/package/glibc/glibc.mk
|
|
|
+++ b/package/glibc/glibc.mk
|
|
|
-@@ -4,20 +4,20 @@
|
|
|
- #
|
|
|
- ################################################################################
|
|
|
-
|
|
|
--ifeq ($(BR2_csky),y)
|
|
|
-+ifeq ($(BR2_arc),y)
|
|
|
-+GLIBC_VERSION = arc-2019.09-release
|
|
|
-+GLIBC_SITE = $(call github,foss-for-synopsys-dwc-arc-processors,glibc,$(GLIBC_VERSION))
|
|
|
-+else ifeq ($(BR2_RISCV_32),y)
|
|
|
-+GLIBC_VERSION = 06983fe52cfe8e4779035c27e8cc5d2caab31531
|
|
|
-+GLIBC_SITE = $(call github,riscv,riscv-glibc,$(GLIBC_VERSION))
|
|
|
-+else ifeq ($(BR2_csky),y)
|
|
|
- GLIBC_VERSION = 7630ed2fa60caea98f500e4a7a51b88f9bf1e176
|
|
|
- GLIBC_SITE = $(call github,c-sky,glibc,$(GLIBC_VERSION))
|
|
|
- else
|
|
|
+@@ -11,7 +11,7 @@ else
|
|
|
# Generate version string using:
|
|
|
# git describe --match 'glibc-*' --abbrev=40 origin/release/MAJOR.MINOR/master | cut -d '-' -f 2-
|
|
|
# When updating the version, please also update localedef
|
|
|
--ifeq ($(BR2_RISCV_32),y)
|
|
|
--# RISC-V 32-bit (RV32) requires glibc 2.33 or newer
|
|
|
--# Until 2.33 is released, just use master
|
|
|
--GLIBC_VERSION = 2.32.9000-69-gbd394d131c10c9ec22c6424197b79410042eed99
|
|
|
--else
|
|
|
--GLIBC_VERSION = 2.32-37-g760e1d287825fa91d4d5a0cc921340c740d803e2
|
|
|
--endif
|
|
|
+-GLIBC_VERSION = 2.33-46-gedfd11197ecf3629bbb4b66c5814da09a61a7f9f
|
|
|
+GLIBC_VERSION = 2.30-67-g4748829f86a458b76642f3e98b1d80f7b868e427
|
|
|
# Upstream doesn't officially provide an https download link.
|
|
|
# There is one (https://sourceware.org/git/glibc.git) but it's not reliable,
|
|
|
# sometimes the connection times out. So use an unofficial github mirror.
|
|
|
-@@ -29,7 +29,6 @@ endif
|
|
|
-
|
|
|
- GLIBC_LICENSE = GPL-2.0+ (programs), LGPL-2.1+, BSD-3-Clause, MIT (library)
|
|
|
- GLIBC_LICENSE_FILES = COPYING COPYING.LIB LICENSES
|
|
|
--GLIBC_CPE_ID_VENDOR = gnu
|
|
|
-
|
|
|
- # glibc is part of the toolchain so disable the toolchain dependency
|
|
|
- GLIBC_ADD_TOOLCHAIN_DEPENDENCY = NO
|
|
|
-@@ -131,9 +130,10 @@ define GLIBC_CONFIGURE_CMDS
|
|
|
- --enable-shared \
|
|
|
- $(if $(BR2_x86_64),--enable-lock-elision) \
|
|
|
- --with-pkgversion="Buildroot" \
|
|
|
-+ --without-cvs \
|
|
|
- --disable-profile \
|
|
|
-- --disable-werror \
|
|
|
- --without-gd \
|
|
|
-+ --enable-obsolete-rpc \
|
|
|
- --enable-kernel=$(call qstrip,$(BR2_TOOLCHAIN_HEADERS_AT_LEAST)) \
|
|
|
- --with-headers=$(STAGING_DIR)/usr/include)
|
|
|
- $(GLIBC_ADD_MISSING_STUB_H)
|
|
|
---
|
|
|
-2.7.4
|
|
|
-
|