Bump to 2.26-4

1 files changed, 30 insertions, 23 deletions

diff --git a/PKGBUILD b/PKGBUILD
index 646f702265c2..6272dadb3513 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,37 +1,44 @@
 # 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>
 # Maintainer: Tavian Barnes <tavianator@tavianator.com>
 
 _target="arm-linux-gnueabihf"
 pkgname=${_target}-glibc
-pkgver=2.25
-pkgrel=7
-_commit=adc7e06fb412a2a1ee52f8cb788caf436335b9f3  # release/2.25/master
+pkgver=2.26
+pkgrel=4
 pkgdesc="GNU C Library (${_target})"
 arch=('any')
 url="http://www.gnu.org/software/libc/"
-license=('GPL' 'LGPL')
-depends=("${_target}-linux-api-headers>=4.10.1-1")
-makedepends=("${_target}-gcc-stage2>=7.1.1-4" 'gperf')
+license=(GPL LGPL)
+depends=("${_target}-linux-api-headers>=4.12.7-1")
+makedepends=("${_target}-gcc-stage2>=7.2.0-3" gperf)
 provides=("${_target}-glibc-headers=${pkgver}" "${_target}-eglibc")
 conflicts=("${_target}-glibc-headers" "${_target}-eglibc")
 replaces=("${_target}-glibc-headers")
-options=('!buildflags' '!strip' 'staticlibs')
+options=(!buildflags !strip staticlibs)
+_commit=58270c0049404ef2f878fdd45df55f17f0b8c1f7
 source=(http://ftp.gnu.org/gnu/libc/glibc-${pkgver}.tar.xz{,.sig}
-        glibc-${_commit}.patch)
-md5sums=('1496c3bf41adf9db0ebd0af01f202eed'
+        glibc-${_commit}.patch
+        0001-Don-t-use-IFUNC-resolver-for-longjmp-or-system-in-li.patch
+        0002-x86-Add-x86_64-to-x86-64-HWCAP-BZ-22093.patch)
+md5sums=('102f637c3812f81111f48f2427611be1'
          'SKIP'
-         '0fa9776db7ab22c15a4767d841fc2eb2')
+         '7ce099a4060f59b7b7dd5ca66605f4e8'
+         'cbc073315c00b03898b7fc614274d6b3'
+         'bd9b13f3294b6357baa809e4416b9f44')
 validpgpkeys=('BC7C7372637EC10C57D7AA6579C43DFBF1CF2187')  # Siddhesh Poyarekar
 
 prepare() {
-  cd glibc-${pkgver}
+  mkdir glibc-build
+  cd glibc-$pkgver
 
-  patch -p1 -i ${srcdir}/glibc-${_commit}.patch
+  patch -p1 -i "$srcdir/glibc-$_commit.patch"
 
-  mkdir ${srcdir}/glibc-build
+  patch -p1 -i "$srcdir/0001-Don-t-use-IFUNC-resolver-for-longjmp-or-system-in-li.patch"
+  patch -p1 -i "$srcdir/0002-x86-Add-x86_64-to-x86-64-HWCAP-BZ-22093.patch"
 }
 
 build() {
@@ -51,20 +58,20 @@ build() {
   export AR=${_target}-ar
   export RANLIB=${_target}-ranlib
 
-  ../glibc-${pkgver}/configure \
+  "$srcdir/glibc-$pkgver/configure" \
       --prefix=/ \
       --libdir=/lib \
       --libexecdir=/lib \
       --with-headers=/usr/${_target}/include \
       --enable-add-ons \
-      --enable-obsolete-rpc \
-      --enable-kernel=2.6.32 \
       --enable-bind-now \
-      --disable-profile \
-      --enable-stackguard-randomization \
-      --enable-stack-protector=strong \
       --enable-lock-elision \
       --disable-multi-arch \
+      --enable-obsolete-nsl \
+      --enable-obsolete-rpc \
+      --enable-stack-protector=strong \
+      --enable-stackguard-randomization \
+      --disable-profile \
       --disable-werror \
       --target=${_target} \
       --host=${_target} \
@@ -77,11 +84,11 @@ 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}
+  rm -rf "$pkgdir/usr/$_target/"{bin,sbin,etc,share,var}
 }