[arch-commits] Commit in automake/repos (3 files)
Felix Yan
felixonmars at archlinux.org
Wed Nov 13 17:45:19 UTC 2019
Date: Wednesday, November 13, 2019 @ 17:45:18
Author: felixonmars
Revision: 368394
archrelease: copy trunk to staging-any
Added:
automake/repos/staging-any/
automake/repos/staging-any/PKGBUILD
(from rev 368393, automake/trunk/PKGBUILD)
automake/repos/staging-any/automake-1.15-dejagnu-testcase.patch
(from rev 368393, automake/trunk/automake-1.15-dejagnu-testcase.patch)
--------------------------------------+
PKGBUILD | 46 ++++++++++++++++++++++++++++++
automake-1.15-dejagnu-testcase.patch | 49 +++++++++++++++++++++++++++++++++
2 files changed, 95 insertions(+)
Copied: automake/repos/staging-any/PKGBUILD (from rev 368393, automake/trunk/PKGBUILD)
===================================================================
--- staging-any/PKGBUILD (rev 0)
+++ staging-any/PKGBUILD 2019-11-13 17:45:18 UTC (rev 368394)
@@ -0,0 +1,46 @@
+# Maintainer: Lukas Fleischer <lfleischer at archlinux.org>
+# Contributor: Allan McRae <allan at archlinux.org>
+# Contributor: judd <jvinet at zeroflux.org>
+
+pkgname=automake
+pkgver=1.16.1
+pkgrel=2
+pkgdesc="A GNU tool for automatically creating Makefiles"
+arch=('any')
+license=('GPL')
+url="https://www.gnu.org/software/automake"
+groups=('base-devel')
+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)
+sha256sums=('5d05bb38a23fd3312b10aea93840feec685bdf4a41146e78882848165d3ae921'
+ 'SKIP'
+ '787b0cc0f94cc28f86169a5482189ec8ed784c99312939534788d2f5841eae77')
+validpgpkeys=('E1622F96D2BB4E58018EEF9860F906016E407573' # Stefano Lattarini
+ 'F2A38D7EEB2B66405761070D0ADEE10094604D37') # Mathieu Lirzin
+
+prepare() {
+ cd ${srcdir}/${pkgname}-${pkgver}
+
+ # 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
+}
+
+check() {
+ cd "${srcdir}/${pkgname}-${pkgver}"
+ make check PYTHON=/usr/bin/python2
+}
+
+package() {
+ cd "${srcdir}/${pkgname}-${pkgver}"
+ make DESTDIR="${pkgdir}" install
+}
Copied: automake/repos/staging-any/automake-1.15-dejagnu-testcase.patch (from rev 368393, automake/trunk/automake-1.15-dejagnu-testcase.patch)
===================================================================
--- staging-any/automake-1.15-dejagnu-testcase.patch (rev 0)
+++ staging-any/automake-1.15-dejagnu-testcase.patch 2019-11-13 17:45:18 UTC (rev 368394)
@@ -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
+
More information about the arch-commits
mailing list