[arch-commits] Commit in grep/trunk (PKGBUILD testsuite.patch)

[Allan McRae]

    Date: Sunday, November 4, 2018 @ 02:11:59
  Author: allan
Revision: 337799

upgpkg: grep 3.1-2

fix FTBFS

Added:
  grep/trunk/testsuite.patch
Modified:
  grep/trunk/PKGBUILD

-----------------+
 PKGBUILD        |   17 ++++++++++++++---
 testsuite.patch |   35 +++++++++++++++++++++++++++++++++++
 2 files changed, 49 insertions(+), 3 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2018-11-04 01:57:07 UTC (rev 337798)
+++ PKGBUILD	2018-11-04 02:11:59 UTC (rev 337799)
@@ -4,7 +4,7 @@
 
 pkgname=grep
 pkgver=3.1
-pkgrel=1
+pkgrel=2
 pkgdesc='A string search utility'
 arch=('x86_64')
 license=('GPL3')
@@ -13,10 +13,21 @@
 depends=('glibc' 'pcre')
 makedepends=('texinfo')
 validpgpkeys=('155D3FC500C834486D1EEA677FD9FCCB000BEEEE') # Jim Meyering
-source=("https://ftp.gnu.org/gnu/$pkgname/$pkgname-$pkgver.tar.xz"{,.sig})
+source=("https://ftp.gnu.org/gnu/$pkgname/$pkgname-$pkgver.tar.xz"{,.sig}
+        testsuite.patch)
 md5sums=('feca7b3e7c7f4aab2b42ecbfc513b070'
-         'SKIP')
+         'SKIP'
+         '0d3082d1d1fb77e7575c106fc4df1341')
 
+prepare() {
+  cd $pkgname-$pkgver
+  
+  # http://git.savannah.gnu.org/cgit/grep.git/patch/?id=c505b0bce73c712f1297bc5f424e0de5e4ec3137
+  patch -p1 -i $srcdir/testsuite.patch
+
+  autoreconf
+}
+
 build() {
   cd $pkgname-$pkgver
   ./configure --prefix=/usr --without-included-regex

Added: testsuite.patch
===================================================================
--- testsuite.patch	                        (rev 0)
+++ testsuite.patch	2018-11-04 02:11:59 UTC (rev 337799)
@@ -0,0 +1,35 @@
+From c505b0bce73c712f1297bc5f424e0de5e4ec3137 Mon Sep 17 00:00:00 2001
+From: Paul Eggert <eggert at cs.ucla.edu>
+Date: Thu, 9 Aug 2018 10:52:48 -0700
+Subject: tests: backref-alt works with glibc 2.28
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+Problem reported by Jaroslav Skarvada (Bug#32409).
+* tests/Makefile.am (XFAIL_TESTS) [!USE_INCLUDED_REGEX]:
+Don’t add backref-alt, since this bug is fixed in glibc 2.28.
+---
+ tests/Makefile.am | 6 +++---
+ 1 file changed, 3 insertions(+), 3 deletions(-)
+
+diff --git a/tests/Makefile.am b/tests/Makefile.am
+index 9f52941..d9f9ee8 100644
+--- a/tests/Makefile.am
++++ b/tests/Makefile.am
+@@ -56,9 +56,9 @@ XFAIL_TESTS = triple-backref
+ if USE_INCLUDED_REGEX
+ XFAIL_TESTS += equiv-classes
+ else
+-# The backslash-alt test fails for glibc, which needs to be fixed.
+-# FIXME-2015: Remove this once the glibc bug is fixed.
+-XFAIL_TESTS += backref-alt
++# The backslash-alt test fails for glibc 2.27 and earlier.
++# If you're using older glibc you can upgrade to glibc 2.28 or later,
++# configure --with-included-regex, or ignore the test failure.
+ endif
+ 
+ TESTS =						\
+-- 
+cgit v1.0-41-gc330
+