summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTony Theodore <tonyt@logyst.com>2019-06-28 08:48:38 (GMT)
committerTony Theodore <tonyt@logyst.com>2019-06-28 08:48:38 (GMT)
commit8d7a1ce6637b1fb20121d2072c7a0a03a869cca0 (patch)
tree30df6adad11b70c2d55c625dfd0c7d9e825b1f61
parentcde3c053c185fb0ec24e039e6f8c8af52966c95a (diff)
downloadmxe-8d7a1ce6637b1fb20121d2072c7a0a03a869cca0.zip
mxe-8d7a1ce6637b1fb20121d2072c7a0a03a869cca0.tar.gz
mxe-8d7a1ce6637b1fb20121d2072c7a0a03a869cca0.tar.bz2
automake: update 1.15 --> 1.16.1
-rw-r--r--plugins/native/automake-1-fixes.patch28
-rw-r--r--plugins/native/automake.mk4
l---------plugins/native/darwin/automake-1-fixes.patch1
3 files changed, 2 insertions, 31 deletions
diff --git a/plugins/native/automake-1-fixes.patch b/plugins/native/automake-1-fixes.patch
deleted file mode 100644
index fe7dd86..0000000
--- a/plugins/native/automake-1-fixes.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-This file is part of MXE. See LICENSE.md for licensing information.
-
-Contains ad hoc patches for cross building.
-
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Patryk (PsychoX) Ludwikowski <psychoxivi@gmail.com>
-Date: Sun, 10 Jun 2018 06:49:41 +0000
-Subject: [PATCH 1/1] Avoids deprecated syntax that causes failure in newer versions of Perl.
-
-Contains patch for using too new Perl. Avoids deprecated syntax that causes failure in newer versions of Perl. More info at https://github.com/mxe/mxe/issues/2140
-
-Backported from:
-https://git.savannah.gnu.org/cgit/automake.git/commit/?id=13f00eb4493c217269b76614759e452d8302955e
-Original author: Paul Eggert <eggert@cs.ucla.edu>
-Signed-off-by: Adam Duskett <aduskett@gmail.com>
-
-diff --git a/bin/automake.in b/bin/automake.in
-index 1111111..2222222 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/plugins/native/automake.mk b/plugins/native/automake.mk
index c10835d..5209a57 100644
--- a/plugins/native/automake.mk
+++ b/plugins/native/automake.mk
@@ -2,8 +2,8 @@
PKG := automake
$(PKG)_IGNORE :=
-$(PKG)_VERSION := 1.15
-$(PKG)_CHECKSUM := 7946e945a96e28152ba5a6beb0625ca715c6e32ac55f2e353ef54def0c8ed924
+$(PKG)_VERSION := 1.16.1
+$(PKG)_CHECKSUM := 608a97523f97db32f1f5d5615c98ca69326ced2054c9f82e65bade7fc4c9dea8
$(PKG)_SUBDIR := $(PKG)-$($(PKG)_VERSION)
$(PKG)_FILE := $(PKG)-$($(PKG)_VERSION).tar.gz
$(PKG)_URL := https://ftp.gnu.org/gnu/automake/$($(PKG)_FILE)
diff --git a/plugins/native/darwin/automake-1-fixes.patch b/plugins/native/darwin/automake-1-fixes.patch
deleted file mode 120000
index a0186c0..0000000
--- a/plugins/native/darwin/automake-1-fixes.patch
+++ /dev/null
@@ -1 +0,0 @@
-../automake-1-fixes.patch \ No newline at end of file