diff options
| author | Jakub Jirutka <jakub@jirutka.cz> | 2017-06-16 01:56:14 +0200 |
|---|---|---|
| committer | Jakub Jirutka <jakub@jirutka.cz> | 2017-06-16 01:58:04 +0200 |
| commit | 52c4a4398525209e0e810883ca0fad7e3cd164f5 (patch) | |
| tree | 668f5e240158daf683a585e2789be68a43c732b5 /main | |
| parent | 08b12ff2f732bca7046c6c9ef96e6b6fa3ed9fc2 (diff) | |
| download | aports-52c4a4398525209e0e810883ca0fad7e3cd164f5.tar.bz2 aports-52c4a4398525209e0e810883ca0fad7e3cd164f5.tar.xz | |
main/automake: fix error with latest Perl
$ automake --version
Unescaped left brace in regex is illegal here in regex; marked by <-- HERE in m/\${ <-- HERE ([^ \t=:+{}]+)}/ at /usr/bin/automake line 3936.
Diffstat (limited to 'main')
| -rw-r--r-- | main/automake/APKBUILD | 8 | ||||
| -rw-r--r-- | main/automake/perl-escape-curly-bracket.patch | 24 |
2 files changed, 29 insertions, 3 deletions
diff --git a/main/automake/APKBUILD b/main/automake/APKBUILD index cd04540103..d19bc6a432 100644 --- a/main/automake/APKBUILD +++ b/main/automake/APKBUILD @@ -1,7 +1,7 @@ # Maintainer: Natanael Copa <ncopa@alpinelinux.org> pkgname=automake pkgver=1.15 -pkgrel=0 +pkgrel=1 pkgdesc="A GNU tool for automatically creating Makefiles" url="http://www.gnu.org/software/automake" arch="noarch" @@ -9,7 +9,8 @@ license="GPL2+ MIT Public Domain" depends="perl" makedepends="autoconf" subpackages="$pkgname-doc" -source="ftp://ftp.gnu.org/gnu/$pkgname/$pkgname-$pkgver.tar.gz" +source="ftp://ftp.gnu.org/gnu/$pkgname/$pkgname-$pkgver.tar.gz + perl-escape-curly-bracket.patch" builddir="$srcdir/$pkgname-$pkgver" build() { @@ -26,4 +27,5 @@ package() { make DESTDIR=$pkgdir install } -sha512sums="6f201f96431f5e3d3081c4d71c884ae1f4f45b9c5c7a1306c9f3f3d4bd5ee5f6fae47b55d35241b3cae84be555cc0ab84c034acdcd5d9a071f6f0ecdee2dec73 automake-1.15.tar.gz" +sha512sums="6f201f96431f5e3d3081c4d71c884ae1f4f45b9c5c7a1306c9f3f3d4bd5ee5f6fae47b55d35241b3cae84be555cc0ab84c034acdcd5d9a071f6f0ecdee2dec73 automake-1.15.tar.gz +2ca23492459ff9124036618e7c64df7fcb86f575fb6d7718f74364883ebbf48faa88f6fbc591ba1202a0bd3704e6dc55707073f6eb8b9201b39ad9a55d3dd081 perl-escape-curly-bracket.patch" diff --git a/main/automake/perl-escape-curly-bracket.patch b/main/automake/perl-escape-curly-bracket.patch new file mode 100644 index 0000000000..4940eff9ad --- /dev/null +++ b/main/automake/perl-escape-curly-bracket.patch @@ -0,0 +1,24 @@ +From 13f00eb4493c217269b76614759e452d8302955e Mon Sep 17 00:00:00 2001 +From: Paul Eggert <eggert@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; + } + |