* update riscv64-unknown-linux-gnu-glibc-headers to 2.39+r64+g70f560fc221-1

This commit is contained in:
Alexander Baldeck 2024-06-21 14:19:33 +02:00
parent 692234bdc4
commit cd17421949
2 changed files with 50 additions and 8 deletions

View File

@ -8,24 +8,31 @@
_target=riscv64-unknown-linux-gnu
pkgname=${_target}-glibc-headers
pkgver=2.38
_commit=6b99458d197ab779ebb6ff632c168e2cbfa4f543
pkgrel=3.1
pkgver=2.39+r64+g70f560fc221
_commit=70f560fc22212f733647c9121c26bbb2307f2e10
pkgrel=1
pkgdesc="GNU C Library headers (${_target})"
arch=('any')
url="http://www.gnu.org/software/libc/"
license=(GPL LGPL)
depends=("${_target}-linux-api-headers>=6.4")
makedepends=("${_target}-gcc-stage1>=13.2.1" python git)
depends=("${_target}-linux-api-headers>=6.8")
makedepends=("${_target}-gcc-stage1>=14.1.1" python git)
options=(!buildflags !strip staticlibs)
source=(git+https://sourceware.org/git/glibc.git#commit=${_commit}
sdt-config.h
sdt.h)
sdt.h
reenable_DT_HASH.patch)
validpgpkeys=(7273542B39962DF7B299931416792B4EA25340F8 # Carlos O'Donell
BC7C7372637EC10C57D7AA6579C43DFBF1CF2187) # Siddhesh Poyarekar
sha256sums=('SKIP'
sha256sums=('13ce6521ed9aee361246b299f3649f31956e7fb905827589a1ec014d4a27b38e'
'cdc234959c6fdb43f000d3bb7d1080b0103f4080f5e67bcfe8ae1aaf477812f0'
'774061aff612a377714a509918a9e0e0aafce708b87d2d7e06b1bd1f6542fe70')
'774061aff612a377714a509918a9e0e0aafce708b87d2d7e06b1bd1f6542fe70'
'cf9fe494f7ec69752a63d1b0a9ad689aa620888ae9b902b6383a6fbc7c1726a7')
pkgver() {
cd glibc
git describe --tags | sed 's/[^-]*-//;s/[^-]*-/&r/;s/-/+/g'
}
prepare() {
mkdir -p glibc-build
@ -59,6 +66,7 @@ build() {
case "${CARCH}" in
x86_64) _configure_flags+=(--enable-cet --enable-multi-arch) ;;
powerpc64) _configure_flags+=(--disable-multi-arch --with-cpu=970); CFLAGS='-O2 -pipe' ;;
*) _configure_flags+=(--disable-multi-arch); CFLAGS='-O2 -pipe' ;;
esac
@ -77,6 +85,8 @@ build() {
export CXX=${_target}-g++
export AR=${_target}-ar
export RANLIB=${_target}-ranlib
export OBJCOPY=${_target}-objcopy
export OBJDUMP=${_target}-objdump
"$srcdir/glibc/configure" \
--libdir=/usr/lib \
@ -88,6 +98,10 @@ build() {
# make some libs and stubs
make csu/subdir_lib
case "${CARCH}" in
powerpc64) sed 's@RTLDLIST=.*@RTLDLIST="/usr/lib/ld64.so.2"@g' -i ${pkgdir}/usr/bin/ldd ;;
esac
}
package() {

View File

@ -0,0 +1,28 @@
From 31915e55f9c34f6137ab1c5ac002375a2d5d4589 Mon Sep 17 00:00:00 2001
From: Frederik Schwan <frederik.schwan@linux.com>
Date: Fri, 4 Aug 2023 15:19:57 +0200
Subject: [PATCH] force --hash-style=both to keep compatibility with old niche
software
---
Makeconfig | 4 ++++
1 file changed, 4 insertions(+)
diff --git a/Makeconfig b/Makeconfig
index 77d7fd14df..2ae67c4beb 100644
--- a/Makeconfig
+++ b/Makeconfig
@@ -378,6 +378,10 @@ relro-LDFLAGS = -Wl,-z,relro
LDFLAGS.so += $(relro-LDFLAGS)
LDFLAGS-rtld += $(relro-LDFLAGS)
+hashstyle-LDFLAGS = -Wl,--hash-style=both
+LDFLAGS.so += $(hashstyle-LDFLAGS)
+LDFLAGS-rtld += $(hashstyle-LDFLAGS)
+
# Linker options to enable and disable DT_RELR.
ifeq ($(have-dt-relr),yes)
dt-relr-ldflag = -Wl,-z,pack-relative-relocs
--
2.41.0