The Perl regexp patch is now upstream, therefore removed. Signed-off-by: Clemens Gruber <clemens.gru...@pqgruber.com> --- .../0001-disable-manpages.patch | 6 ++--- patches/automake-1.15.1/series | 4 +++ ...0002-automake-port-to-Perl-5.22-and-later.patch | 30 ---------------------- patches/automake-1.15/series | 5 ---- rules/host-autotools-automake.make | 4 +-- 5 files changed, 9 insertions(+), 40 deletions(-) rename patches/{automake-1.15 => automake-1.15.1}/0001-disable-manpages.patch (90%) create mode 100644 patches/automake-1.15.1/series delete mode 100644 patches/automake-1.15/0002-automake-port-to-Perl-5.22-and-later.patch delete mode 100644 patches/automake-1.15/series
diff --git a/patches/automake-1.15/0001-disable-manpages.patch b/patches/automake-1.15.1/0001-disable-manpages.patch similarity index 90% rename from patches/automake-1.15/0001-disable-manpages.patch rename to patches/automake-1.15.1/0001-disable-manpages.patch index c5dae844d..c27ede362 100644 --- a/patches/automake-1.15/0001-disable-manpages.patch +++ b/patches/automake-1.15.1/0001-disable-manpages.patch @@ -10,10 +10,10 @@ Signed-off-by: Clemens Gruber <clemens.gru...@pqgruber.com> 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Makefile.in b/Makefile.in -index 3059ca824148..5f73bbe76a59 100644 +index 5fb31219a68f..2a840ccfefdc 100644 --- a/Makefile.in +++ b/Makefile.in -@@ -3365,7 +3365,7 @@ distcleancheck: distclean +@@ -3367,7 +3367,7 @@ distcleancheck: distclean check-am: all-am $(MAKE) $(AM_MAKEFLAGS) check-TESTS check-local check: check-am @@ -22,7 +22,7 @@ index 3059ca824148..5f73bbe76a59 100644 installdirs: for dir in "$(DESTDIR)$(bindir)" "$(DESTDIR)$(infodir)" "$(DESTDIR)$(man1dir)" "$(DESTDIR)$(amdir)" "$(DESTDIR)$(automake_acdir)" "$(DESTDIR)$(automake_internal_acdir)" "$(DESTDIR)$(docdir)" "$(DESTDIR)$(perllibdir)" "$(DESTDIR)$(pkgvdatadir)" "$(DESTDIR)$(scriptdir)" "$(DESTDIR)$(system_acdir)" "$(DESTDIR)$(perllibdir)"; do \ test -z "$$dir" || $(MKDIR_P) "$$dir"; \ -@@ -3432,7 +3432,7 @@ install-data-am: install-dist_amDATA install-dist_automake_acDATA \ +@@ -3434,7 +3434,7 @@ install-data-am: install-dist_amDATA install-dist_automake_acDATA \ install-dist_automake_internal_acDATA install-dist_docDATA \ install-dist_perllibDATA install-dist_pkgvdataDATA \ install-dist_scriptDATA install-dist_system_acDATA \ diff --git a/patches/automake-1.15.1/series b/patches/automake-1.15.1/series new file mode 100644 index 000000000..49cfb7da5 --- /dev/null +++ b/patches/automake-1.15.1/series @@ -0,0 +1,4 @@ +# generated by git-ptx-patches +#tag:base --start-number 1 +0001-disable-manpages.patch +# e1b9b6e1a9fe3d2536735809749d1147 - git-ptx-patches magic diff --git a/patches/automake-1.15/0002-automake-port-to-Perl-5.22-and-later.patch b/patches/automake-1.15/0002-automake-port-to-Perl-5.22-and-later.patch deleted file mode 100644 index d254d2914..000000000 --- a/patches/automake-1.15/0002-automake-port-to-Perl-5.22-and-later.patch +++ /dev/null @@ -1,30 +0,0 @@ -From: Paul Eggert <egg...@cs.ucla.edu> -Date: Thu, 31 Mar 2016 16:35:29 -0700 -Subject: [PATCH] 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. - -[Backported from: - http://git.savannah.gnu.org/cgit/automake.git/commit/?id=13f00eb4493c217269b76614759e452d8302955e] -Signed-off-by: Adam Duskett <adusk...@gmail.com> ---- - bin/automake.in | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/bin/automake.in b/bin/automake.in -index eedc8bcf196c..527d61c14ffc 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; - } - diff --git a/patches/automake-1.15/series b/patches/automake-1.15/series deleted file mode 100644 index 166a84f2c..000000000 --- a/patches/automake-1.15/series +++ /dev/null @@ -1,5 +0,0 @@ -# generated by git-ptx-patches -#tag:base --start-number 1 -0001-disable-manpages.patch -0002-automake-port-to-Perl-5.22-and-later.patch -# da8723af9df37607f1b6a4af04e5e24e - git-ptx-patches magic diff --git a/rules/host-autotools-automake.make b/rules/host-autotools-automake.make index 4e7b1ac13..5827a63fb 100644 --- a/rules/host-autotools-automake.make +++ b/rules/host-autotools-automake.make @@ -16,8 +16,8 @@ LAZY_PACKAGES-$(PTXCONF_HOST_AUTOTOOLS_AUTOMAKE) += host-autotools-automake # # Paths and names # -HOST_AUTOTOOLS_AUTOMAKE_VERSION := 1.15 -HOST_AUTOTOOLS_AUTOMAKE_MD5 := 9a1ddb0e053474d9d1105cfe39b0c48d +HOST_AUTOTOOLS_AUTOMAKE_VERSION := 1.15.1 +HOST_AUTOTOOLS_AUTOMAKE_MD5 := 24cd3501b6ad8cd4d7e2546f07e8b4d4 HOST_AUTOTOOLS_AUTOMAKE := automake-$(HOST_AUTOTOOLS_AUTOMAKE_VERSION) HOST_AUTOTOOLS_AUTOMAKE_SUFFIX := tar.xz HOST_AUTOTOOLS_AUTOMAKE_URL := $(call ptx/mirror, GNU, automake/$(HOST_AUTOTOOLS_AUTOMAKE).$(HOST_AUTOTOOLS_AUTOMAKE_SUFFIX)) -- 2.13.2 _______________________________________________ ptxdist mailing list ptxdist@pengutronix.de