update to version 2.38

- PKGBUILD cleanup
- changed packaging to avoid complaining by makepkg

1 files changed, 32 insertions, 41 deletions

diff --git a/PKGBUILD b/PKGBUILD
index 3e63ca6dd845..7765b6b419fe 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,50 +1,37 @@
-# Maintainer: Vyacheslav Razykov <v.razykov@gmail.com>
 # Contributor: Alexander 'hatred' Drozdov <adrozdoff@gmail.com>
 # Contributor: toha257 <toha257@gmail.com>
 # Contributor: Allan McRae <allan@archlinux.org>
 # Contributor: Bartłomiej Piotrowski <bpiotrowski@archlinux.org>
 # Contributor: Kevin Mihelich <kevin@archlinuxarm.org>
 # Contributor: Tavian Barnes <tavianator@tavianator.com>
+# Contributor: Vyacheslav Razykov <v.razykov@gmail.com>
+# Maintainer: Wilken Gottwalt <wilken dot gottwalt at posteo dot net>
 
-_target="arm-linux-gnueabihf"
+_target=arm-linux-gnueabihf
 pkgname=${_target}-glibc
-pkgver=2.36
+pkgver=2.38
 pkgrel=1
-pkgdesc="GNU C Library (${_target})"
+pkgdesc="GNU C Library"
 arch=('any')
 url="https://www.gnu.org/software/libc/"
 license=(GPL LGPL)
-depends=("${_target}-linux-api-headers>=5.14.9-1")
-makedepends=("${_target}-gcc-stage2>=12.1.0-1" python gperf)
+depends=("${_target}-linux-api-headers>=6.1")
+makedepends=("${_target}-gcc-stage2>=13.2.0" python)
 provides=("${_target}-glibc-headers=${pkgver}" "${_target}-eglibc")
 conflicts=("${_target}-glibc-headers" "${_target}-eglibc")
 replaces=("${_target}-glibc-headers")
 options=(!buildflags !strip !lto staticlibs)
 source=(https://ftp.gnu.org/gnu/glibc/glibc-${pkgver}.tar.xz{,.sig}
-        sdt.h sdt-config.h
-        reenable_DT_HASH.patch)
+        sdt.h sdt-config.h)
 validpgpkeys=(7273542B39962DF7B299931416792B4EA25340F8 # Carlos O'Donell
               BC7C7372637EC10C57D7AA6579C43DFBF1CF2187) # Siddhesh Poyarekar
-md5sums=('00e9b89e043340f688bc93ec03239b57'
+md5sums=('778cce0ea6bf7f84ca8caacf4a01f45b'
          'SKIP'
-         '91fec3b7e75510ae2ac42533aa2e695e'
-         '680df504c683640b02ed4a805797c0b2'
-         '4a3e4243338481bb5e70b74281347ae8')
+         '55e32bca61fcf621143090fc33cde970'
+         '680df504c683640b02ed4a805797c0b2')
 
 prepare() {
   mkdir -p glibc-build
-
-  [[ -d glibc-${pkgver} ]] && ln -s glibc-${pkgver} glibc
-  cd glibc
-
-  local i; for i in ${source[@]}; do
-    case ${i%::*} in
-      *.patch)
-        echo "Applying ${i}"
-        patch -p1 -i "${srcdir}/${i}"
-        ;;
-    esac
-  done
 }
 
 build() {
@@ -54,10 +41,10 @@ build() {
       --enable-add-ons
       --enable-bind-now
       --enable-lock-elision
-      --disable-multi-arch
       --enable-stack-protector=strong
       --enable-stackguard-randomization
       --enable-systemtap
+      --disable-multi-arch
       --disable-profile
       --disable-werror
   )
@@ -75,7 +62,7 @@ build() {
   #
   CFLAGS="${CFLAGS/-fno-plt/} -g -O2"
   CXXFLAGS="${CXXFLAGS/-fno-plt/} -g -O2"
-  LDFLAGS=${LDFLAGS/,-z,now/}
+  LDFLAGS="${LDFLAGS/,-z,now/}"
 
   export BUILD_CC=gcc
   export CC=${_target}-gcc
@@ -83,13 +70,13 @@ build() {
   export AR=${_target}-ar
   export RANLIB=${_target}-ranlib
 
-  "${srcdir}/glibc-${pkgver}/configure" \
-      --libdir=/lib \
-      --libexecdir=/lib \
-      ${_configure_flags[@]} \
-      --target=${_target} \
-      --host=${_target} \
-      --build=${CHOST}
+  ../glibc-${pkgver}/configure \
+    --target=${_target} \
+    --host=${_target} \
+    --build=${CHOST} \
+    --libdir=/lib \
+    --libexecdir=/lib \
+    ${_configure_flags[@]}
 
   echo "build-programs=no" >> configparms
   make
@@ -98,16 +85,20 @@ build() {
 package() {
   cd glibc-build
 
-  make install_root="${pkgdir}/usr/${_target}" install
+  make install_root="${pkgdir}"/usr/"${_target}" install
 
-  mkdir -p "${pkgdir}/usr/${_target}/usr"
-  ln -s ../{include,lib} "${pkgdir}/usr/${_target}/usr"
+  mkdir -p "${pkgdir}"/usr/"${_target}"/usr
+  ln -s ../{include,lib} "${pkgdir}"/usr/"${_target}"/usr
 
-  # Remove unneeded for compilation files
-  rm -rf "${pkgdir}/usr/${_target}/"{bin,sbin,etc,share,var}
+  # remove unneeded for compilation files
+  rm -rf "${pkgdir}"/usr/"${_target}"/{bin,sbin,etc,share,var}
 
-  # Provide tracing probes to libstdc++ for exceptions, possibly for other
+  # provide tracing probes to libstdc++ for exceptions, possibly for other
   # libraries too. Useful for gdb's catch command.
-  install -Dm644 "${srcdir}/sdt.h" "${pkgdir}/usr/${_target}/include/sys/sdt.h"
-  install -Dm644 "${srcdir}/sdt-config.h" "${pkgdir}/usr/${_target}/include/sys/sdt-config.h"
+  install -Dm644 "${srcdir}"/sdt.h "${pkgdir}"/usr/"${_target}"/include/sys/sdt.h
+  install -Dm644 "${srcdir}"/sdt-config.h "${pkgdir}"/usr/"${_target}"/include/sys/sdt-config.h
+
+  # strip it manually to prevent makepkg complaining about srcdir references
+  strip "${pkgdir}"/usr/"${_target}"/lib/* 2>/dev/null || true
+  find "${pkgdir}"/usr/"${_target}"/lib -type f -exec /usr/bin/"${_target}"-strip --strip-unneeded {} \; 2>/dev/null || true
 }