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

Andreas Radke andyrtr at archlinux.org
Fri Jun 5 19:55:07 UTC 2020


    Date: Friday, June 5, 2020 @ 19:55:06
  Author: andyrtr
Revision: 388353

upgpkg: automake 1.16.2-2: build tests with python v3; run some more tests; drop unneeded patch - issues has been fixed upstream in a different way; add gcc workaround

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

--------------------------------------+
 PKGBUILD                             |   28 +++++++++---------
 automake-1.15-dejagnu-testcase.patch |   49 ---------------------------------
 2 files changed, 14 insertions(+), 63 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2020-06-05 15:04:15 UTC (rev 388352)
+++ PKGBUILD	2020-06-05 19:55:06 UTC (rev 388353)
@@ -4,7 +4,7 @@
 
 pkgname=automake
 pkgver=1.16.2
-pkgrel=1
+pkgrel=2
 pkgdesc="A GNU tool for automatically creating Makefiles"
 arch=('any')
 license=('GPL')
@@ -13,24 +13,24 @@
 depends=('perl' 'bash')
 makedepends=('autoconf')
 checkdepends=('dejagnu' 'gcc-fortran' 'java-environment' 'vala' 'emacs' 'cscope'
-              'python2' 'python-virtualenv')
-source=("https://ftp.gnu.org/gnu/${pkgname}/${pkgname}-${pkgver}.tar.xz"{,.sig}
-        automake-1.15-dejagnu-testcase.patch)
+              'expect' 'ncompress' 'gettext' 'lzip' 'zip' 'sharutils' 'help2man'
+              # disable TeX tests for now, lots of them fail and need upstream
+              # fixes for current texlive release
+              #'texlive-bin' 'texinfo'
+              'python' 'python-virtualenv')
+source=("https://ftp.gnu.org/gnu/${pkgname}/${pkgname}-${pkgver}.tar.xz"{,.sig})
 sha512sums=('a4aa0e41ceaa7df5bc303a6004597fb158f4198594017cd2c586fd9f5a29233e081766bf22b7e4ef0d4c8c3d45a8591009427efa319b362922a958ac1ef6e27b'
-            'SKIP'
-            'fbea84532ebb9210b95d82104ee53d91bcf97e76c2ebad66794c22d8fd205b263dcba6c04aa87273cc40243ce4c5ae97df63417b52f37288167ad2b1aa80fd04')
+            'SKIP')
 validpgpkeys=('E1622F96D2BB4E58018EEF9860F906016E407573'   # Stefano Lattarini
               'F2A38D7EEB2B66405761070D0ADEE10094604D37'   # Mathieu Lirzin
               '155D3FC500C834486D1EEA677FD9FCCB000BEEEE')  # Jim Meyering
 
-prepare() {
-	cd "${srcdir}/${pkgname}-${pkgver}"
+build() {
+	# revert to behavior before gcc10 to pass tests
+	# FAIL t/vala-mix2.sh (exit status: 2)
+	# bugreport has been sent upstream
+	export CFLAGS="$CFLAGS -fcommon"
 
-	# fix testsuite issue with resent dejagnu
-	patch -p1 -i "$srcdir"/automake-1.15-dejagnu-testcase.patch
-}
-
-build() {
 	cd "${srcdir}/${pkgname}-${pkgver}"
 	./configure --build=$CHOST --prefix=/usr
 	make
@@ -38,7 +38,7 @@
 
 check() {
 	cd "${srcdir}/${pkgname}-${pkgver}"
-	make check PYTHON=/usr/bin/python2
+	make check
 }
 
 package() {

Deleted: automake-1.15-dejagnu-testcase.patch
===================================================================
--- automake-1.15-dejagnu-testcase.patch	2020-06-05 15:04:15 UTC (rev 388352)
+++ automake-1.15-dejagnu-testcase.patch	2020-06-05 19:55:06 UTC (rev 388353)
@@ -1,49 +0,0 @@
-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
-



More information about the arch-commits mailing list