[arch-commits] Commit in automake/trunk (3 files)
Lukas Fleischer
lfleischer at archlinux.org
Thu Jul 6 15:31:52 UTC 2017
Date: Thursday, July 6, 2017 @ 15:31:51
Author: lfleischer
Revision: 299767
upgpkg: automake 1.15.1-1
Upstream update.
Modified:
automake/trunk/PKGBUILD
Deleted:
automake/trunk/automake-1.15-gzip-envvar.patch
automake/trunk/automake-1.15-perl-regex.patch
---------------------------------+
PKGBUILD | 32 ++++++-----------
automake-1.15-gzip-envvar.patch | 68 --------------------------------------
automake-1.15-perl-regex.patch | 26 --------------
3 files changed, 11 insertions(+), 115 deletions(-)
Modified: PKGBUILD
===================================================================
--- PKGBUILD 2017-07-06 15:01:24 UTC (rev 299766)
+++ PKGBUILD 2017-07-06 15:31:51 UTC (rev 299767)
@@ -1,10 +1,10 @@
-# $Id$
-# Maintainer: Allan McRae <allan at archlinux.org>
+# Maintainer: Lukas Fleischer <lfleischer at archlinux.org>
+# Contributor: Allan McRae <allan at archlinux.org>
# Contributor: judd <jvinet at zeroflux.org>
pkgname=automake
-pkgver=1.15
-pkgrel=2
+pkgver=1.15.1
+pkgrel=1
pkgdesc="A GNU tool for automatically creating Makefiles"
arch=('any')
license=('GPL')
@@ -14,42 +14,32 @@
makedepends=('autoconf')
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-dejagnu-testcase.patch)
-md5sums=('9a1ddb0e053474d9d1105cfe39b0c48d'
+md5sums=('24cd3501b6ad8cd4d7e2546f07e8b4d4'
'SKIP'
- 'ec24c629cad74c88555ee499c38dbd6e'
- 'fa71c83d3f9d32d9a4007152b829074c'
'ffa4dd8eb78cea82c3009d76087598b1')
-validpgpkeys=('E1622F96D2BB4E58018EEF9860F906016E407573') # Stefano Lattarini
+validpgpkeys=('E1622F96D2BB4E58018EEF9860F906016E407573' # Stefano Lattarini
+ 'F2A38D7EEB2B66405761070D0ADEE10094604D37') # Mathieu Lirzin
-
prepare() {
cd ${srcdir}/${pkgname}-${pkgver}
- # 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
-
# fix testsuite issue with resent dejagnu
patch -p1 -i $srcdir/automake-1.15-dejagnu-testcase.patch
}
build() {
- cd ${srcdir}/${pkgname}-${pkgver}
+ cd "${srcdir}/${pkgname}-${pkgver}"
./configure --build=$CHOST --prefix=/usr
make
}
check() {
- cd ${srcdir}/${pkgname}-${pkgver}
+ cd "${srcdir}/${pkgname}-${pkgver}"
make check
}
package() {
- cd ${srcdir}/${pkgname}-${pkgver}
- make DESTDIR=${pkgdir} install
+ cd "${srcdir}/${pkgname}-${pkgver}"
+ make DESTDIR="${pkgdir}" install
}
Deleted: automake-1.15-gzip-envvar.patch
===================================================================
--- automake-1.15-gzip-envvar.patch 2017-07-06 15:01:24 UTC (rev 299766)
+++ automake-1.15-gzip-envvar.patch 2017-07-06 15:31:51 UTC (rev 299767)
@@ -1,68 +0,0 @@
-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
Deleted: automake-1.15-perl-regex.patch
===================================================================
--- automake-1.15-perl-regex.patch 2017-07-06 15:01:24 UTC (rev 299766)
+++ automake-1.15-perl-regex.patch 2017-07-06 15:31:51 UTC (rev 299767)
@@ -1,26 +0,0 @@
-From 13f00eb4493c217269b76614759e452d8302955e Mon Sep 17 00:00:00 2001
-From: Paul Eggert <eggert at 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
More information about the arch-commits
mailing list