core/glibc to 2.40+r66+g7d4b6bcae91f-1

This commit is contained in:
Kevin Mihelich 2025-01-24 00:38:03 +00:00
parent 6f2335607c
commit 0dc3a4dfae
2 changed files with 14 additions and 11 deletions

View file

@ -1,6 +1,6 @@
pkgbase = glibc
pkgver = 2.40+r16+gaa533d58ff
pkgrel = 2
pkgver = 2.40+r66+g7d4b6bcae91f
pkgrel = 1
url = https://www.gnu.org/software/libc
arch = x86_64
license = GPL-2.0-or-later
@ -11,7 +11,7 @@ pkgbase = glibc
makedepends = python
options = staticlibs
options = !lto
source = git+https://sourceware.org/git/glibc.git#commit=aa533d58ff12e27771d9c960a727d74992a3f2a3
source = git+https://sourceware.org/git/glibc.git#commit=7d4b6bcae91f29d7b4daf15bab06b66cf1d2217c
source = locale.gen.txt
source = locale-gen
source = lib32-glibc.conf
@ -19,7 +19,7 @@ pkgbase = glibc
source = sdt-config.h
validpgpkeys = 7273542B39962DF7B299931416792B4EA25340F8
validpgpkeys = BC7C7372637EC10C57D7AA6579C43DFBF1CF2187
b2sums = 74c4f1e1231834579d19c96cc60fc370c9c4468e254fe069aad6102c8678d163ab6e58ebf0a11de680483105ba02d362842a817d698e134731f70c2d5b383eed
b2sums = 0ad666b79b56dfdeb0600efff72d14940510562a7cefdc2a15e071442a50fe45949e24b23a23b24f2b1ddbfe7da3e137827cc1ee177df743960892272c1c643f
b2sums = c859bf2dfd361754c9e3bbd89f10de31f8e81fd95dc67b77d10cb44e23834b096ba3caa65fbc1bd655a8696c6450dfd5a096c476b3abf5c7e125123f97ae1a72
b2sums = 04fbb3b0b28705f41ccc6c15ed5532faf0105370f22133a2b49867e790df0491f5a1255220ff6ebab91a462f088d0cf299491b3eb8ea53534cb8638a213e46e3
b2sums = 7c265e6d36a5c0dff127093580827d15519b6c7205c2e1300e82f0fb5b9dd00b6accb40c56581f18179c4fbbc95bd2bf1b900ace867a83accde0969f7b609f8a
@ -40,11 +40,11 @@ pkgname = glibc
pkgname = lib32-glibc
pkgdesc = GNU C Library (32-bit)
install = lib32-glibc.install
depends = glibc=2.40+r16+gaa533d58ff
depends = glibc=2.40+r66+g7d4b6bcae91f
options = staticlibs
options = !lto
options = !emptydirs
pkgname = glibc-locales
pkgdesc = Pregenerated locales for GNU C Library
depends = glibc=2.40+r16+gaa533d58ff
depends = glibc=2.40+r66+g7d4b6bcae91f

View file

@ -16,9 +16,9 @@ noautobuild=1
pkgbase=glibc
pkgname=(glibc glibc-locales)
pkgver=2.40+r16+gaa533d58ff
_commit=aa533d58ff12e27771d9c960a727d74992a3f2a3
pkgrel=2
pkgver=2.40+r66+g7d4b6bcae91f
_commit=7d4b6bcae91f29d7b4daf15bab06b66cf1d2217c
pkgrel=1
arch=(x86_64)
url='https://www.gnu.org/software/libc'
license=(GPL-2.0-or-later LGPL-2.1-or-later)
@ -31,7 +31,7 @@ source=("git+https://sourceware.org/git/glibc.git#commit=${_commit}"
)
validpgpkeys=(7273542B39962DF7B299931416792B4EA25340F8 # Carlos O'Donell
BC7C7372637EC10C57D7AA6579C43DFBF1CF2187) # Siddhesh Poyarekar
b2sums=('74c4f1e1231834579d19c96cc60fc370c9c4468e254fe069aad6102c8678d163ab6e58ebf0a11de680483105ba02d362842a817d698e134731f70c2d5b383eed'
b2sums=('0ad666b79b56dfdeb0600efff72d14940510562a7cefdc2a15e071442a50fe45949e24b23a23b24f2b1ddbfe7da3e137827cc1ee177df743960892272c1c643f'
'c859bf2dfd361754c9e3bbd89f10de31f8e81fd95dc67b77d10cb44e23834b096ba3caa65fbc1bd655a8696c6450dfd5a096c476b3abf5c7e125123f97ae1a72'
'04fbb3b0b28705f41ccc6c15ed5532faf0105370f22133a2b49867e790df0491f5a1255220ff6ebab91a462f088d0cf299491b3eb8ea53534cb8638a213e46e3'
'a6a5e2f2a627cc0d13d11a82458cfd0aa75ec1c5a3c7647e5d5a3bb1d4c0770887a3909bfda1236803d5bc9801bfd6251e13483e9adf797e4725332cd0d91a0e'
@ -39,7 +39,7 @@ b2sums=('74c4f1e1231834579d19c96cc60fc370c9c4468e254fe069aad6102c8678d163ab6e58e
pkgver() {
cd glibc
git describe --tags | sed 's/[^-]*-//;s/[^-]*-/&r/;s/-/+/g'
git describe --abbrev=12 --tags | sed 's/[^-]*-//;s/[^-]*-/&r/;s/-/+/g'
}
prepare() {
@ -72,6 +72,9 @@ build() {
[[ $CARCH == "armv7h" ]] && _configure_flags+=(--host=armv7l-unknown-linux-gnueabihf --build=armv7l-unknown-linux-gnueabihf)
[[ $CARCH == "aarch64" ]] && _configure_flags+=(--host=aarch64-unknown-linux-gnu --build=aarch64-unknown-linux-gnu --enable-memory-tagging)
# -fno-plt leads to 118 tests failing on glibc 2.39 on aarch64
CFLAGS=${CFLAGS/-fno-plt/}
(
cd glibc-build