Date: Sunday, May 15, 2016 @ 04:32:38
Author: allan
Revision: 268053
begin fixing testsuite failures...
Added:
automake/trunk/automake-1.15-gzip-envvar.patch
automake/trunk/automake-1.15-perl-regex.patch
Modified:
automake/trunk/PKGBUILD
Deleted:
automake/trunk/automake.install
---------------------------------+
PKGBUILD | 19 +++++++---
automake-1.15-gzip-envvar.patch | 68 ++++++++++++++++++++++++++++++++++++++
automake-1.15-perl-regex.patch | 26 ++++++++++++++
automake.install | 22 ------------
4 files changed, 107 insertions(+), 28 deletions(-)
Modified: PKGBUILD
===================================================================
--- PKGBUILD 2016-05-15 00:58:44 UTC (rev 268052)
+++ PKGBUILD 2016-05-15 02:32:38 UTC (rev 268053)
@@ -4,7 +4,7 @@
pkgname=automake
pkgver=1.15
-pkgrel=1
+pkgrel=2
pkgdesc="A GNU tool for automatically creating Makefiles"
arch=('any')
license=('GPL')
@@ -13,17 +13,24 @@
depends=('perl' 'bash')
makedepends=('autoconf')
checkdepends=('dejagnu' 'python' 'gcc-fortran' 'java-environment' 'vala'
'emacs' 'cscope')
-install=automake.install
-source=(ftp://ftp.gnu.org/gnu/${pkgname}/${pkgname}-${pkgver}.tar.xz{,.sig})
+source=(ftp://ftp.gnu.org/gnu/${pkgname}/${pkgname}-${pkgver}.tar.xz{,.sig}
+ automake-1.15-perl-regex.patch
+ automake-1.15-gzip-envvar.patch)
md5sums=('9a1ddb0e053474d9d1105cfe39b0c48d'
- 'SKIP')
+ 'SKIP'
+ 'ec24c629cad74c88555ee499c38dbd6e'
+ 'fa71c83d3f9d32d9a4007152b829074c')
validpgpkeys=('E1622F96D2BB4E58018EEF9860F906016E407573') # Stefano Lattarini
+
prepare() {
cd ${srcdir}/${pkgname}-${pkgver}
- # skip failing test...
- sed -i "/instmany-python.sh/d" Makefile.in
+ # fix regex issue with recent perl
+ patch -p1 -i $srcdir/automake-1.15-perl-regex.patch
+
+ # fix testsuite issues with recent gzip
+ patch -p1 -i $srcdir/automake-1.15-gzip-envvar.patch
}
build() {
Added: automake-1.15-gzip-envvar.patch
===================================================================
--- automake-1.15-gzip-envvar.patch (rev 0)
+++ automake-1.15-gzip-envvar.patch 2016-05-15 02:32:38 UTC (rev 268053)
@@ -0,0 +1,68 @@
+From 749468ac63042820bc3da85ece5bed64b0c15d62 Mon Sep 17 00:00:00 2001
+From: Paul Eggert <eggert at>
+Date: Tue, 29 Mar 2016 02:44:19 +0000
+Subject: automake: port better to future gzip
+
+* lib/am/distdir.am (dist-gzip, dist-shar, distcheck):
+Port better to future versions of gzip, which are planned to
+deprecate the GZIP environment variable (Bug#20132).
+---
+diff --git a/lib/am/distdir.am b/lib/am/distdir.am
+index d4dd8cc..87c6730 100644
+--- a/lib/am/distdir.am
++++ b/lib/am/distdir.am
+@@ -309,6 +309,16 @@ endif %?TOPDIR_P%
+ ## We order DIST_TARGETS by expected duration of the compressors,
+ ## slowest first, for better parallelism in "make dist". Do not
+ ## reorder DIST_ARCHIVES, users may expect gzip to be first.
++##
++## Traditionally, gzip prepended the contents of the GZIP environment
++## variable to its arguments, and the commands below formerly used
++## this by invoking 'GZIP=$(GZIP_ENV) gzip'. The GZIP environment
++## variable is now considered to be obsolescent, so the commands below
++## now use 'eval GZIP= gzip $(GZIP_ENV)' instead; this should work
++## with both older and newer gzip implementations. The 'eval' is to
++## support makefile assignments like 'GZIP_ENV = "-9 -n"' that quote
++## the GZIP_ENV right-hand side because that was needed with the
++## former invocation pattern.
+
+ if %?TOPDIR_P%
+
+@@ -316,7 +326,7 @@ if %?TOPDIR_P%
+ GZIP_ENV = --best
+ .PHONY: dist-gzip
+ dist-gzip: distdir
+- tardir=$(distdir) && $(am__tar) | GZIP=$(GZIP_ENV) gzip -c
>$(distdir).tar.gz
++ tardir=$(distdir) && $(am__tar) | eval GZIP= gzip $(GZIP_ENV) -c
>$(distdir).tar.gz
+ $(am__post_remove_distdir)
+
+ ?BZIP2?DIST_ARCHIVES += $(distdir).tar.bz2
+@@ -352,7 +362,7 @@ dist-shar: distdir
+ @echo WARNING: "Support for shar distribution archives is" \
+ "deprecated." >&2
+ @echo WARNING: "It will be removed altogether in Automake 2.0" >&2
+- shar $(distdir) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).shar.gz
++ shar $(distdir) | eval GZIP= gzip $(GZIP_ENV) -c >$(distdir).shar.gz
+ $(am__post_remove_distdir)
+
+ ?ZIP?DIST_ARCHIVES += $(distdir).zip
+@@ -412,7 +422,7 @@ endif %?SUBDIRS%
+ distcheck: dist
+ case '$(DIST_ARCHIVES)' in \
+ *.tar.gz*) \
+- GZIP=$(GZIP_ENV) gzip -dc $(distdir).tar.gz | $(am__untar) ;;\
++ eval GZIP= gzip $(GZIP_ENV) -dc $(distdir).tar.gz | $(am__untar) ;;\
+ *.tar.bz2*) \
+ bzip2 -dc $(distdir).tar.bz2 | $(am__untar) ;;\
+ *.tar.lz*) \
+@@ -422,7 +432,7 @@ distcheck: dist
+ *.tar.Z*) \
+ uncompress -c $(distdir).tar.Z | $(am__untar) ;;\
+ *.shar.gz*) \
+- GZIP=$(GZIP_ENV) gzip -dc $(distdir).shar.gz | unshar ;;\
++ eval GZIP= gzip $(GZIP_ENV) -dc $(distdir).shar.gz | unshar ;;\
+ *.zip*) \
+ unzip $(distdir).zip ;;\
+ esac
+--
+cgit v0.9.0.2
Added: automake-1.15-perl-regex.patch
===================================================================
--- automake-1.15-perl-regex.patch (rev 0)
+++ automake-1.15-perl-regex.patch 2016-05-15 02:32:38 UTC (rev 268053)
@@ -0,0 +1,26 @@
+From 13f00eb4493c217269b76614759e452d8302955e Mon Sep 17 00:00:00 2001
+From: Paul Eggert <egg...@cs.ucla.edu>
+Date: Thu, 31 Mar 2016 23:35:29 +0000
+Subject: automake: port to Perl 5.22 and later
+
+Without this change, Perl 5.22 complains "Unescaped left brace in
+regex is deprecated" and this is planned to become a hard error in
+Perl 5.26. See:
+http://search.cpan.org/dist/perl-5.22.0/pod/perldelta.pod#A_literal_%22{%22_should_now_be_escaped_in_a_pattern
+* bin/automake.in (substitute_ac_subst_variables): Escape left brace.
+---
+diff --git a/bin/automake.in b/bin/automake.in
+index a3a0aa3..2c8f31e 100644
+--- a/bin/automake.in
++++ b/bin/automake.in
+@@ -3878,7 +3878,7 @@ sub substitute_ac_subst_variables_worker
+ sub substitute_ac_subst_variables
+ {
+ my ($text) = @_;
+- $text =~ s/\${([^ \t=:+{}]+)}/substitute_ac_subst_variables_worker ($1)/ge;
++ $text =~ s/\$[{]([^ \t=:+{}]+)}/substitute_ac_subst_variables_worker
($1)/ge;
+ return $text;
+ }
+
+--
+cgit v0.9.0.2
Deleted: automake.install
===================================================================
--- automake.install 2016-05-15 00:58:44 UTC (rev 268052)
+++ automake.install 2016-05-15 02:32:38 UTC (rev 268053)
@@ -1,22 +0,0 @@
-infodir=/usr/share/info
-filelist=(automake.info automake.info-1 automake.info-2)
-
-post_install() {
- [ -x usr/bin/install-info ] || return 0
- for file in ${filelist[@]}; do
- install-info $infodir/$file.gz $infodir/dir 2> /dev/null
- done
-}
-
-post_upgrade() {
- post_install $1
-}
-
-pre_remove() {
- [ -x usr/bin/install-info ] || return 0
- for file in ${filelist[@]}; do
- install-info --delete $infodir/$file.gz $infodir/dir 2> /dev/null
- done
-}
-
-# vim:set ts=2 sw=2 et:
