[arch-commits] Commit in automake/trunk (2 files)

[Allan McRae]

    Date: Friday, September 9, 2016 @ 05:12:44
  Author: allan
Revision: 276083

upgpkg: automake 1.15-2

fix regex warning, fix testsuite failures, removing python from checkdeps due to incompatibility with latests version

Added:
  automake/trunk/automake-1.15-dejagnu-testcase.patch
Modified:
  automake/trunk/PKGBUILD

--------------------------------------+
 PKGBUILD                             |   13 ++++++--
 automake-1.15-dejagnu-testcase.patch |   49 +++++++++++++++++++++++++++++++++
 2 files changed, 58 insertions(+), 4 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2016-09-09 02:13:55 UTC (rev 276082)
+++ PKGBUILD	2016-09-09 05:12:44 UTC (rev 276083)
@@ -12,14 +12,16 @@
 groups=('base-devel')
 depends=('perl' 'bash')
 makedepends=('autoconf')
-checkdepends=('dejagnu' 'python' 'gcc-fortran' 'java-environment' 'vala' 'emacs' 'cscope')
+checkdepends=('dejagnu' 'gcc-fortran' 'java-environment' 'vala' 'emacs' 'cscope')  # 'python'
 source=(ftp://ftp.gnu.org/gnu/${pkgname}/${pkgname}-${pkgver}.tar.xz{,.sig}
         automake-1.15-perl-regex.patch
-        automake-1.15-gzip-envvar.patch)
+        automake-1.15-gzip-envvar.patch
+        automake-1.15-dejagnu-testcase.patch)
 md5sums=('9a1ddb0e053474d9d1105cfe39b0c48d'
          'SKIP'
          'ec24c629cad74c88555ee499c38dbd6e'
-         'fa71c83d3f9d32d9a4007152b829074c')
+         'fa71c83d3f9d32d9a4007152b829074c'
+         'ffa4dd8eb78cea82c3009d76087598b1')
 validpgpkeys=('E1622F96D2BB4E58018EEF9860F906016E407573')   # Stefano Lattarini
 
 
@@ -31,11 +33,14 @@
 
   # fix testsuite issues with recent gzip
   patch -p1 -i $srcdir/automake-1.15-gzip-envvar.patch
+
+  # fix testsuite issue with resent dejagnu
+  patch -p1 -i $srcdir/automake-1.15-dejagnu-testcase.patch
 }
 
 build() {
   cd ${srcdir}/${pkgname}-${pkgver}
-  ./configure --prefix=/usr
+  ./configure --build=$CHOST --prefix=/usr
   make
 }
 

Added: automake-1.15-dejagnu-testcase.patch
===================================================================
--- automake-1.15-dejagnu-testcase.patch	                        (rev 0)
+++ automake-1.15-dejagnu-testcase.patch	2016-09-09 05:12:44 UTC (rev 276083)
@@ -0,0 +1,49 @@
+From 3b86722e504c686d3e825ca8870708cce7580190 Mon Sep 17 00:00:00 2001
+From: Pavel Raiskup <praiskup at redhat.com>
+Date: Mon, 27 Jun 2016 23:10:12 +0200
+Subject: [PATCH] tests: fix bug in dejagnu testcase
+
+This resolves testsuite error:
+ERROR: tcl error sourcing ./spanner.test/spanner.exp.
+ERROR: couldn't execute "./spanner": no such file or directory
+    while executing
+"spawn $SPANNER"
+    (file "./spanner.test/spanner.exp" line 2)
+    invoked from within
+"source ./spanner.test/spanner.exp"
+    ("uplevel" body line 1)
+    invoked from within
+"uplevel #0 source ./spanner.test/spanner.exp"
+    invoked from within
+"catch "uplevel #0 source $test_file_name""
+
+.. which was there probably for a very long time, but now with
+dejagnu 1.6 the runtest binary started to validly exit with
+non-zero status.
+
+* t/check12.sh (Makefile.am): Also distribute files from
+$(DEJATOOL) because otherwise 'runtest' binary fails later during
+'make distcheck' because of incomplete list of distributed files.
+
+Proposed upstream:
+http://thread.gmane.org/gmane.comp.sysutils.automake.patches/9941
+
+---
+ t/check12.sh | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/t/check12.sh b/t/check12.sh
+index 0f3928a..306c720 100644
+--- a/t/check12.sh
++++ b/t/check12.sh
+@@ -61,6 +61,7 @@ DEJATOOL = hammer spanner
+ AM_RUNTESTFLAGS = HAMMER=$(srcdir)/hammer SPANNER=$(srcdir)/spanner
+ EXTRA_DIST += hammer.test/hammer.exp
+ EXTRA_DIST += spanner.test/spanner.exp
++EXTRA_DIST += $(DEJATOOL)
+ END
+ 
+ cat > hammer << 'END'
+-- 
+2.7.4
+