* [ptxdist] [PATCH] host-autotools-automake: version bump 1.5.1 -> 1.6.1
@ 2018-05-14 10:54 Baeuerle, Florian
2018-05-15 6:30 ` Uwe Kleine-König
0 siblings, 1 reply; 6+ messages in thread
From: Baeuerle, Florian @ 2018-05-14 10:54 UTC (permalink / raw)
To: ptxdist
Removed patch:
- 0001-disable-manpages.patch:
Build succeeds without this patch.
Signed-off-by: Florian Bäuerle <florian.baeuerle@allegion.com>
---
.../0001-disable-manpages.patch | 33 -------------------
patches/automake-1.15.1/series | 4 ---
rules/host-autotools-automake.make | 4 +--
3 files changed, 2 insertions(+), 39 deletions(-)
delete mode 100644 patches/automake-1.15.1/0001-disable-manpages.patch
delete mode 100644 patches/automake-1.15.1/series
diff --git a/patches/automake-1.15.1/0001-disable-manpages.patch b/patches/automake-1.15.1/0001-disable-manpages.patch
deleted file mode 100644
index c27ede362..000000000
--- a/patches/automake-1.15.1/0001-disable-manpages.patch
+++ /dev/null
@@ -1,33 +0,0 @@
-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 5fb31219a68f..2a840ccfefdc 100644
---- a/Makefile.in
-+++ b/Makefile.in
-@@ -3367,7 +3367,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"; \
-@@ -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 \
-- 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.1/series b/patches/automake-1.15.1/series
deleted file mode 100644
index 49cfb7da5..000000000
--- a/patches/automake-1.15.1/series
+++ /dev/null
@@ -1,4 +0,0 @@
-# generated by git-ptx-patches
-#tag:base --start-number 1
-0001-disable-manpages.patch
-# e1b9b6e1a9fe3d2536735809749d1147 - git-ptx-patches magic
diff --git a/rules/host-autotools-automake.make b/rules/host-autotools-automake.make
index 2f1478608..cbe62bbb6 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.1
-HOST_AUTOTOOLS_AUTOMAKE_MD5 := 24cd3501b6ad8cd4d7e2546f07e8b4d4
+HOST_AUTOTOOLS_AUTOMAKE_VERSION := 1.16.1
+HOST_AUTOTOOLS_AUTOMAKE_MD5 := 53f38e7591fa57c3d2cee682be668e5b
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))
_______________________________________________
ptxdist mailing list
ptxdist@pengutronix.de
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [ptxdist] [PATCH] host-autotools-automake: version bump 1.5.1 -> 1.6.1
2018-05-14 10:54 [ptxdist] [PATCH] host-autotools-automake: version bump 1.5.1 -> 1.6.1 Baeuerle, Florian
@ 2018-05-15 6:30 ` Uwe Kleine-König
2018-05-15 10:53 ` Michael Olbrich
2018-05-15 10:53 ` Baeuerle, Florian
0 siblings, 2 replies; 6+ messages in thread
From: Uwe Kleine-König @ 2018-05-15 6:30 UTC (permalink / raw)
To: ptxdist, Clemens Gruber
Hello,
On Mon, May 14, 2018 at 10:54:56AM +0000, Baeuerle, Florian wrote:
> Removed patch:
>
> - 0001-disable-manpages.patch:
> Build succeeds without this patch.
the problem that was fixed with this patch maybe only happened on Arch,
at least that's what reading through
5d107ecae118ac3dd49fdf10c54901eb0a4c3bdf suggests. Adding Clemens Gruber
to the recipients, who authored the patch. Maybe he can test/comment?
Best regards
Uwe
--
Pengutronix e.K. | Uwe Kleine-König |
Industrial Linux Solutions | http://www.pengutronix.de/ |
_______________________________________________
ptxdist mailing list
ptxdist@pengutronix.de
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [ptxdist] [PATCH] host-autotools-automake: version bump 1.5.1 -> 1.6.1
2018-05-15 6:30 ` Uwe Kleine-König
@ 2018-05-15 10:53 ` Michael Olbrich
2018-05-15 11:28 ` Clemens Gruber
2018-05-15 10:53 ` Baeuerle, Florian
1 sibling, 1 reply; 6+ messages in thread
From: Michael Olbrich @ 2018-05-15 10:53 UTC (permalink / raw)
To: ptxdist; +Cc: Clemens Gruber
Hi,
On Tue, May 15, 2018 at 08:30:58AM +0200, Uwe Kleine-König wrote:
> On Mon, May 14, 2018 at 10:54:56AM +0000, Baeuerle, Florian wrote:
> > Removed patch:
> >
> > - 0001-disable-manpages.patch:
> > Build succeeds without this patch.
>
> the problem that was fixed with this patch maybe only happened on Arch,
> at least that's what reading through
> 5d107ecae118ac3dd49fdf10c54901eb0a4c3bdf suggests. Adding Clemens Gruber
> to the recipients, who authored the patch. Maybe he can test/comment?
I agree. Clemens, it would be great if you could check if this patch is
still needed.
Michael
--
Pengutronix e.K. | |
Industrial Linux Solutions | http://www.pengutronix.de/ |
Peiner Str. 6-8, 31137 Hildesheim, Germany | Phone: +49-5121-206917-0 |
Amtsgericht Hildesheim, HRA 2686 | Fax: +49-5121-206917-5555 |
_______________________________________________
ptxdist mailing list
ptxdist@pengutronix.de
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [ptxdist] [PATCH] host-autotools-automake: version bump 1.5.1 -> 1.6.1
2018-05-15 6:30 ` Uwe Kleine-König
2018-05-15 10:53 ` Michael Olbrich
@ 2018-05-15 10:53 ` Baeuerle, Florian
2019-01-07 10:50 ` Uwe Kleine-König
1 sibling, 1 reply; 6+ messages in thread
From: Baeuerle, Florian @ 2018-05-15 10:53 UTC (permalink / raw)
To: ptxdist, clemens.gruber
Hi,
Am Dienstag, den 15.05.2018, 08:30 +0200 schrieb Uwe Kleine-König:
> Hello,
>
> On Mon, May 14, 2018 at 10:54:56AM +0000, Baeuerle, Florian wrote:
> > Removed patch:
> >
> > - 0001-disable-manpages.patch:
> > Build succeeds without this patch.
>
> the problem that was fixed with this patch maybe only happened on Arch,
> at least that's what reading through
> 5d107ecae118ac3dd49fdf10c54901eb0a4c3bdf suggests. Adding Clemens Gruber
> to the recipients, who authored the patch. Maybe he can test/comment?
If the problem only occurred on Arch Linux, then I can confirm it's no
longer occurring - I've built my ptxdist project successfully on Arch Linux
with this patch (which removed the patch in question).
Did some further investigation.
Apparently, help2man was updated a while after the automake v1.15.1 release:
https://git.savannah.gnu.org/cgit/automake.git/commit/doc/help2man?id=9322f409a957f153b38ff37ba79ddf4c19cff6ca
The previous help2man v1.40.8 was from 2012:
https://salsa.debian.org/bod/help2man/commit/4efbcca2dc796a5f9bf2797905fc9e6bee6a6afc
I'm a bit amazed by how automake manages their dependencies, but on topic:
Possibly the problem, previously fixed by that patch, got fixed starting
with automake v1.16 because they sneaked in 4 years of help2man bugfixes?
I could not find anything suspicious in the help2man commit logs though.
Best Regards
Florian
_______________________________________________
ptxdist mailing list
ptxdist@pengutronix.de
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [ptxdist] [PATCH] host-autotools-automake: version bump 1.5.1 -> 1.6.1
2018-05-15 10:53 ` Michael Olbrich
@ 2018-05-15 11:28 ` Clemens Gruber
0 siblings, 0 replies; 6+ messages in thread
From: Clemens Gruber @ 2018-05-15 11:28 UTC (permalink / raw)
To: ptxdist
Hi,
On Tue, May 15, 2018 at 12:53:10PM +0200, Michael Olbrich wrote:
> Hi,
>
> On Tue, May 15, 2018 at 08:30:58AM +0200, Uwe Kleine-König wrote:
> > On Mon, May 14, 2018 at 10:54:56AM +0000, Baeuerle, Florian wrote:
> > > Removed patch:
> > >
> > > - 0001-disable-manpages.patch:
> > > Build succeeds without this patch.
> >
> > the problem that was fixed with this patch maybe only happened on Arch,
> > at least that's what reading through
> > 5d107ecae118ac3dd49fdf10c54901eb0a4c3bdf suggests. Adding Clemens Gruber
> > to the recipients, who authored the patch. Maybe he can test/comment?
>
> I agree. Clemens, it would be great if you could check if this patch is
> still needed.
I can confirm that the patch is no longer needed on ArchLinux!
As Florian said, it's probably the update to the latest help2man in
automake 1.16 that fixed this.
Clemens
_______________________________________________
ptxdist mailing list
ptxdist@pengutronix.de
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [ptxdist] [PATCH] host-autotools-automake: version bump 1.5.1 -> 1.6.1
2018-05-15 10:53 ` Baeuerle, Florian
@ 2019-01-07 10:50 ` Uwe Kleine-König
0 siblings, 0 replies; 6+ messages in thread
From: Uwe Kleine-König @ 2019-01-07 10:50 UTC (permalink / raw)
To: ptxdist; +Cc: clemens.gruber
Hello,
On Tue, May 15, 2018 at 10:53:54AM +0000, Baeuerle, Florian wrote:
> Am Dienstag, den 15.05.2018, 08:30 +0200 schrieb Uwe Kleine-König:
> > Hello,
> >
> > On Mon, May 14, 2018 at 10:54:56AM +0000, Baeuerle, Florian wrote:
> > > Removed patch:
> > >
> > > - 0001-disable-manpages.patch:
> > > Build succeeds without this patch.
> >
> > the problem that was fixed with this patch maybe only happened on Arch,
> > at least that's what reading through
> > 5d107ecae118ac3dd49fdf10c54901eb0a4c3bdf suggests. Adding Clemens Gruber
> > to the recipients, who authored the patch. Maybe he can test/comment?
>
> If the problem only occurred on Arch Linux, then I can confirm it's no
> longer occurring - I've built my ptxdist project successfully on Arch Linux
> with this patch (which removed the patch in question).
>
> Did some further investigation.
>
> Apparently, help2man was updated a while after the automake v1.15.1 release:
> https://git.savannah.gnu.org/cgit/automake.git/commit/doc/help2man?id=9322f409a957f153b38ff37ba79ddf4c19cff6ca
>
> The previous help2man v1.40.8 was from 2012:
> https://salsa.debian.org/bod/help2man/commit/4efbcca2dc796a5f9bf2797905fc9e6bee6a6afc
FTR: I just got a failure to build on Centos 7.5.1804 which was fixed by
the patch that got dropped here. Didn't debug further yet.
Best regards
Uwe
--
Pengutronix e.K. | Uwe Kleine-König |
Industrial Linux Solutions | http://www.pengutronix.de/ |
_______________________________________________
ptxdist mailing list
ptxdist@pengutronix.de
^ permalink raw reply [flat|nested] 6+ messages in thread
end of thread, other threads:[~2019-01-07 10:50 UTC | newest]
Thread overview: 6+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2018-05-14 10:54 [ptxdist] [PATCH] host-autotools-automake: version bump 1.5.1 -> 1.6.1 Baeuerle, Florian
2018-05-15 6:30 ` Uwe Kleine-König
2018-05-15 10:53 ` Michael Olbrich
2018-05-15 11:28 ` Clemens Gruber
2018-05-15 10:53 ` Baeuerle, Florian
2019-01-07 10:50 ` Uwe Kleine-König
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox