[arch-commits] Commit in automake/trunk (2 files)
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
===
--- PKGBUILD2020-06-05 15:04:15 UTC (rev 388352)
+++ PKGBUILD2020-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
'155D3FC500C834486D1EEA677FD9FCCB000B') # 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.patch2020-06-05 15:04:15 UTC (rev
388352)
+++ automake-1.15-dejagnu-testcase.patch2020-06-05 19:55:06 UTC (rev
388353)
@@ -1,49 +0,0 @@
-From 3b86722e504c686d3e825ca8870708cce7580190 Mon Sep 17 00:00:00 2001
-From: Pavel Raiskup
-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
-
[arch-commits] Commit in automake/trunk (2 files)
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
===
--- PKGBUILD2016-09-09 02:13:55 UTC (rev 276082)
+++ PKGBUILD2016-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.patch2016-09-09 05:12:44 UTC (rev
276083)
@@ -0,0 +1,49 @@
+From 3b86722e504c686d3e825ca8870708cce7580190 Mon Sep 17 00:00:00 2001
+From: Pavel Raiskup
+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
+
[arch-commits] Commit in automake/trunk (2 files)
Date: Wednesday, August 15, 2012 @ 03:18:49
Author: allan
Revision: 165304
upgpkg: automake 1.12.3-1
clean-up old patch
Modified:
automake/trunk/PKGBUILD
Deleted:
automake/trunk/automake-1.12.2-aclocal7-test-fix.diff
+
PKGBUILD |7 ++-
automake-1.12.2-aclocal7-test-fix.diff | 18 --
2 files changed, 2 insertions(+), 23 deletions(-)
Modified: PKGBUILD
===
--- PKGBUILD2012-08-15 07:12:15 UTC (rev 165303)
+++ PKGBUILD2012-08-15 07:18:49 UTC (rev 165304)
@@ -13,15 +13,12 @@
depends=('perl' 'bash')
makedepends=('autoconf')
install=automake.install
-source=(ftp://ftp.gnu.org/gnu/${pkgname}/${pkgname}-${pkgver}.tar.xz{,.sig}
-automake-1.12.2-aclocal7-test-fix.diff)
+source=(ftp://ftp.gnu.org/gnu/${pkgname}/${pkgname}-${pkgver}.tar.xz{,.sig})
md5sums=('0df082825f8f41087eb70c5088f4515e'
- '1e272ddf91d347e1316afd970568ee81'
- '12280109fc55cfb6197feecfbe7ab513')
+ '1e272ddf91d347e1316afd970568ee81')
build() {
cd ${srcdir}/${pkgname}-${pkgver}
- #patch -p2 -i $srcdir/automake-1.12.2-aclocal7-test-fix.diff
./configure --prefix=/usr
make
}
Deleted: automake-1.12.2-aclocal7-test-fix.diff
===
--- automake-1.12.2-aclocal7-test-fix.diff 2012-08-15 07:12:15 UTC (rev
165303)
+++ automake-1.12.2-aclocal7-test-fix.diff 2012-08-15 07:18:49 UTC (rev
165304)
@@ -1,18 +0,0 @@
-Fix a race condition that causes aclocal7 to fail on fast machines (see the
-comment below).
-
-diff -x config.log -x config.status -ru tmp/automake-1.12.2/t/aclocal7.sh
work/automake-1.12.2/t/aclocal7.sh
tmp/automake-1.12.2/t/aclocal7.sh 2012-07-08 11:48:25.0 +0100
-+++ work/automake-1.12.2/t/aclocal7.sh 2012-07-10 11:58:50.325999591 +0100
-@@ -45,6 +45,11 @@
- $AUTOMAKE --no-force
- }
-
-+# aclocal will rewrite aclocal.m4 unless the input files are all older than
the
-+# existing aclocal.m4 -- sleep to ensure somedefs.m4 has an older timestamp
-+# than the aclocal.m4 that the next aclocal call will generate.
-+$sleep
-+
- $ACLOCAL -I m4
- AUTOMAKE_after_aclocal
-
[arch-commits] Commit in automake/trunk (2 files)
Date: Tuesday, July 10, 2012 @ 17:11:45
Author: allan
Revision: 163208
upgpkg: automake 1.12.2-1
upstream update
Added:
automake/trunk/automake-1.12.2-aclocal7-test-fix.diff
Modified:
automake/trunk/PKGBUILD
+
PKGBUILD | 11 +++
automake-1.12.2-aclocal7-test-fix.diff | 18 ++
2 files changed, 25 insertions(+), 4 deletions(-)
Modified: PKGBUILD
===
--- PKGBUILD2012-07-10 15:48:58 UTC (rev 163207)
+++ PKGBUILD2012-07-10 21:11:45 UTC (rev 163208)
@@ -3,7 +3,7 @@
# Contributor: judd jvi...@zeroflux.org
pkgname=automake
-pkgver=1.12.1
+pkgver=1.12.2
pkgrel=1
pkgdesc=A GNU tool for automatically creating Makefiles
arch=('any')
@@ -13,12 +13,15 @@
depends=('perl' 'bash')
makedepends=('autoconf')
install=automake.install
-source=(ftp://ftp.gnu.org/gnu/${pkgname}/${pkgname}-${pkgver}.tar.xz{,.sig})
-md5sums=('036d79de6e443e02aec2be1df2b4f0ac'
- '3f8f31210a3030ff9146a6696774f5e9')
+source=(ftp://ftp.gnu.org/gnu/${pkgname}/${pkgname}-${pkgver}.tar.xz{,.sig}
+automake-1.12.2-aclocal7-test-fix.diff)
+md5sums=('56c3ab38a5ed8f2b825341b4e007372a'
+ '09e754ad7198853dc6abe22cc5e6ba4b'
+ '12280109fc55cfb6197feecfbe7ab513')
build() {
cd ${srcdir}/${pkgname}-${pkgver}
+ patch -p2 -i $srcdir/automake-1.12.2-aclocal7-test-fix.diff
./configure --prefix=/usr
make
}
Added: automake-1.12.2-aclocal7-test-fix.diff
===
--- automake-1.12.2-aclocal7-test-fix.diff (rev 0)
+++ automake-1.12.2-aclocal7-test-fix.diff 2012-07-10 21:11:45 UTC (rev
163208)
@@ -0,0 +1,18 @@
+Fix a race condition that causes aclocal7 to fail on fast machines (see the
+comment below).
+
+diff -x config.log -x config.status -ru tmp/automake-1.12.2/t/aclocal7.sh
work/automake-1.12.2/t/aclocal7.sh
+--- tmp/automake-1.12.2/t/aclocal7.sh 2012-07-08 11:48:25.0 +0100
work/automake-1.12.2/t/aclocal7.sh 2012-07-10 11:58:50.325999591 +0100
+@@ -45,6 +45,11 @@
+ $AUTOMAKE --no-force
+ }
+
++# aclocal will rewrite aclocal.m4 unless the input files are all older than
the
++# existing aclocal.m4 -- sleep to ensure somedefs.m4 has an older timestamp
++# than the aclocal.m4 that the next aclocal call will generate.
++$sleep
++
+ $ACLOCAL -I m4
+ AUTOMAKE_after_aclocal
+
