diff options
| -rw-r--r-- | patches/automake-1.15.1/0001-disable-manpages.patch | 33 | ||||
| -rw-r--r-- | patches/automake-1.15.1/series | 4 | ||||
| -rw-r--r-- | rules/host-autotools-automake.make | 4 |
3 files changed, 2 insertions, 39 deletions
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)) |