[ptxdist] [PATCH] host-autotools-automake: fix build errors

[ptxdist] [PATCH] host-autotools-automake: fix build errors

[Clemens Gruber]

When building automake 1.15, the following error occurs on ArchLinux:
help2man: can't get `--help' info from automake-1.15
Try `--no-discard-stderr' if option outputs to stderr
make[1]: *** [Makefile:3687: doc/automake-1.15.1] Error 255

Another error occurs with Perl version 5.26:
"Unescaped left brace in regex is illegal here in regex"

Solution: Patch Makefile.in to no longer build the manpages and add a
patch to fix the regex in automake.in.

Signed-off-by: Clemens Gruber <clemens.gruber@pqgruber.com>
---
 patches/automake-1.15/0001-disable-manpages.patch  | 33 ++++++++++++++++++++++
 ...0002-automake-port-to-Perl-5.22-and-later.patch | 30 ++++++++++++++++++++
 patches/automake-1.15/series                       |  5 ++++
 3 files changed, 68 insertions(+)
 create mode 100644 patches/automake-1.15/0001-disable-manpages.patch
 create mode 100644 patches/automake-1.15/0002-automake-port-to-Perl-5.22-and-later.patch
 create mode 100644 patches/automake-1.15/series

diff --git a/patches/automake-1.15/0001-disable-manpages.patch b/patches/automake-1.15/0001-disable-manpages.patch
new file mode 100644
index 000000000..c5dae844d
--- /dev/null
+++ b/patches/automake-1.15/0001-disable-manpages.patch
@@ -0,0 +1,33 @@
+From: Clemens Gruber <clemens.gruber@pqgruber.com>
+Date: Fri, 9 Jun 2017 17:48:11 +0200
+Subject: [PATCH] disable manpages
+
+Disable manpages build and installation to fix a build error.
+
+Signed-off-by: Clemens Gruber <clemens.gruber@pqgruber.com>
+---
+ Makefile.in | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/Makefile.in b/Makefile.in
+index 3059ca824148..5f73bbe76a59 100644
+--- a/Makefile.in
++++ b/Makefile.in
+@@ -3365,7 +3365,7 @@ distcleancheck: distclean
+ check-am: all-am
+ 	$(MAKE) $(AM_MAKEFLAGS) check-TESTS check-local
+ check: check-am
+-all-am: Makefile $(INFO_DEPS) $(SCRIPTS) $(MANS) $(DATA)
++all-am: Makefile $(INFO_DEPS) $(SCRIPTS) $(DATA)
+ 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 \
+ 	install-dist_automake_internal_acDATA install-dist_docDATA \
+ 	install-dist_perllibDATA install-dist_pkgvdataDATA \
+ 	install-dist_scriptDATA install-dist_system_acDATA \
+-	install-info-am install-man install-nodist_perllibDATA
++	install-info-am install-nodist_perllibDATA
+ 	@$(NORMAL_INSTALL)
+ 	$(MAKE) $(AM_MAKEFLAGS) install-data-hook
+ install-dvi: install-dvi-am
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
new file mode 100644
index 000000000..d254d2914
--- /dev/null
+++ b/patches/automake-1.15/0002-automake-port-to-Perl-5.22-and-later.patch
@@ -0,0 +1,30 @@
+From: Paul Eggert <eggert@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 <aduskett@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
new file mode 100644
index 000000000..166a84f2c
--- /dev/null
+++ b/patches/automake-1.15/series
@@ -0,0 +1,5 @@
+# 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
-- 
2.13.1


_______________________________________________
ptxdist mailing list
ptxdist@pengutronix.de