Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=4b335e55f443734990723a0932682ec4487770cc
commit 4b335e55f443734990723a0932682ec4487770cc Author: crazy <[email protected]> Date: Tue Jan 17 11:34:12 2017 +0100 automake-1.15-4-x86_64 * added patches to fix these annoying perl escape warnings diff --git a/source/devel/automake/FrugalBuild b/source/devel/automake/FrugalBuild index 11c62d9..4f616c7 100644 --- a/source/devel/automake/FrugalBuild +++ b/source/devel/automake/FrugalBuild @@ -3,15 +3,17 @@ pkgname=automake pkgver=1.15 -pkgrel=3 +pkgrel=4 pkgdesc="A tool for automatically generating Makefiles" url="http://www.gnu.org/software/automake"; depends=('perl>=5.24.0-6' 'bash') groups=('devel' 'devel-core') archs=("x86_64") Fup2gnugz -source=(http://ftp.gnu.org/gnu/$pkgname/$pkgname-$pkgver.tar.gz) -signatures=($source.sig) +source=(http://ftp.gnu.org/gnu/$pkgname/$pkgname-$pkgver.tar.gz \ + automake-1.15-mdate-tz.patch \ + automake-1.15-perl-escape-curly-bracket.patch) +signatures=($source.sig '' '') build() { diff --git a/source/devel/automake/automake-1.15-mdate-tz.patch b/source/devel/automake/automake-1.15-mdate-tz.patch new file mode 100644 index 0000000..e00f2bf --- /dev/null +++ b/source/devel/automake/automake-1.15-mdate-tz.patch @@ -0,0 +1,53 @@ +https://bugs.gentoo.org/520818 +https://bugs.gentoo.org/574492 +https://lists.gnu.org/archive/html/bug-automake/2014-10/msg00003.html +https://lists.gnu.org/archive/html/bug-automake/2014-10/msg00004.html + +https://debbugs.gnu.org/20314 +https://bugs.debian.org/782345 +https://lists.gnu.org/archive/html/automake-patches/2015-04/msg00000.html + +From: Reiner Herrmann <[email protected]> +Date: Sat, 18 Jul 2015 14:10:35 -0400 +Subject: Make output of mdate-sh deterministic + +mdate-sh pretty-prints the modification time of a file. +But it's output can vary depending on the timezone of +the caller. Someone in timezone GMT-12 will get a different +result (day) than someone in timezone GMT+12. + +As this output is also used to create/update stamp files, +which influence the further build process, the build result +can vary. +To enable reproducible builds and to have a more deterministic +build behavior, this change fixes the timezone to UTC. + +Signed-off-by: Reiner Herrmann <reiner at reiner-h.de> +--- + lib/mdate-sh | 6 +++++- + 1 file changed, 5 insertions(+), 1 deletion(-) + +diff --git a/lib/mdate-sh b/lib/mdate-sh +index e8dfaca..9e2c0c9 100755 +--- a/lib/mdate-sh ++++ b/lib/mdate-sh +@@ -1,7 +1,7 @@ + #!/bin/sh + # Get modification time of a file or directory and pretty-print it. + +-scriptversion=2010-08-21.06; # UTC ++scriptversion=2015-04-09.19; # UTC + + # Copyright (C) 1995-2014 Free Software Foundation, Inc. + # written by Ulrich Drepper <[email protected]>, June 1995 +@@ -74,6 +74,10 @@ export LC_ALL + LC_TIME=C + export LC_TIME + ++# Use UTC to get reproducible result ++TZ=UTC ++export TZ ++ + # GNU ls changes its time format in response to the TIME_STYLE + # variable. Since we cannot assume 'unset' works, revert this + # variable to its documented default. diff --git a/source/devel/automake/automake-1.15-perl-escape-curly-bracket.patch b/source/devel/automake/automake-1.15-perl-escape-curly-bracket.patch new file mode 100644 index 0000000..268548d --- /dev/null +++ b/source/devel/automake/automake-1.15-perl-escape-curly-bracket.patch @@ -0,0 +1,37 @@ +http://debbugs.gnu.org/cgi/bugreport.cgi?bug=21001 + +From 34163794a58b5bd91c5d6bd9adf5437571c7a479 Mon Sep 17 00:00:00 2001 +From: Pavel Raiskup <[email protected]> +Date: Tue, 7 Jul 2015 10:54:24 +0200 +Subject: [PATCH] bin/automake: escape '{' in regexp pattern + +Based on perlre(1) documentation: +.. in Perl v5.26, literal uses of a curly bracket will be required +to be escaped, say by preceding them with a backslash ("\{" ) or +enclosing them within square brackets ("[{]") .. + +References: +https://bugzilla.redhat.com/1239379 + +* bin/automake.in (substitute_ac_subst_variables): Escape the +occurrence of '{' character. +--- + bin/automake.in | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/bin/automake.in b/bin/automake.in +index 0c29184..c294ced 100644 +--- a/bin/automake.in ++++ b/bin/automake.in +@@ -3898,7 +3898,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; + } + +-- +2.1.0 + _______________________________________________ Frugalware-git mailing list [email protected] http://frugalware.org/mailman/listinfo/frugalware-git
