From: Thomas Langer <thomas.langer.71@gmail.com>
Date: Tue, 27 Jun 2017 16:26:28 +0000 (+0200)
Subject: automake: Update to version 1.15.1
X-Git-Url: http://git.cdn.openwrt.org/?a=commitdiff_plain;h=eafaef3765152526e29a18329900b9ba39eae3bb;p=openwrt%2Fstaging%2Faparcar.git

automake: Update to version 1.15.1

The new version includes the fix for new perl versions,
so remove the related patch.

Signed-off-by: Thomas Langer <thomas.langer.71@gmail.com>
---

diff --git a/tools/automake/Makefile b/tools/automake/Makefile
index 14585f8888..2e618f9974 100644
--- a/tools/automake/Makefile
+++ b/tools/automake/Makefile
@@ -7,11 +7,11 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=automake
-PKG_VERSION:=1.15
+PKG_VERSION:=1.15.1
 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.xz
 PKG_SOURCE_URL:=@GNU/automake
-PKG_HASH:=9908c75aabd49d13661d6dcb1bc382252d22cc77bf733a2d55e87f2aa2db8636
+PKG_HASH:=af6ba39142220687c500f79b4aa2f181d9b24e4f8d8ec497cea4ba26c64bedaf
 
 include $(INCLUDE_DIR)/host-build.mk
 
@@ -24,7 +24,7 @@ HOST_CONFIGURE_VARS += \
 	am_cv_prog_PERL_ithreads=no
 
 define Host/Configure
-	(cd $(HOST_BUILD_DIR); $(AM_TOOL_PATHS) STAGING_DIR="" ./bootstrap.sh)
+	(cd $(HOST_BUILD_DIR); $(AM_TOOL_PATHS) STAGING_DIR="" ./bootstrap)
 	$(call Host/Configure/Default)
 endef
 
diff --git a/tools/automake/patches/000-relocatable.patch b/tools/automake/patches/000-relocatable.patch
index 59864f2ad5..d05b25e61c 100644
--- a/tools/automake/patches/000-relocatable.patch
+++ b/tools/automake/patches/000-relocatable.patch
@@ -24,7 +24,7 @@
 +
  # aclocal - create aclocal.m4 by scanning configure.ac
  
- # Copyright (C) 1996-2014 Free Software Foundation, Inc.
+ # Copyright (C) 1996-2017 Free Software Foundation, Inc.
 @@ -27,7 +29,7 @@ eval 'case $# in 0) exec @PERL@ -S "$0";
  
  BEGIN
@@ -59,7 +59,7 @@
 +$^W = 1;
 +
  # automake - create Makefile.in from Makefile.am
- # Copyright (C) 1994-2014 Free Software Foundation, Inc.
+ # Copyright (C) 1994-2017 Free Software Foundation, Inc.
  
 @@ -31,7 +33,7 @@ use strict;
  
@@ -79,7 +79,7 @@
  
 +$^W = 1;
 +
- # Copyright (C) 2012-2014 Free Software Foundation, Inc.
+ # Copyright (C) 2012-2017 Free Software Foundation, Inc.
  
  # This program is free software; you can redistribute it and/or modify
 --- a/t/wrap/automake.in
@@ -91,6 +91,6 @@
  
 +$^W = 1;
 +
- # Copyright (C) 2012-2014 Free Software Foundation, Inc.
+ # Copyright (C) 2012-2017 Free Software Foundation, Inc.
  
  # This program is free software; you can redistribute it and/or modify
diff --git a/tools/automake/patches/010-automake-port-to-Perl-5.22-and-later.patch b/tools/automake/patches/010-automake-port-to-Perl-5.22-and-later.patch
deleted file mode 100644
index 31b9273d54..0000000000
--- a/tools/automake/patches/010-automake-port-to-Perl-5.22-and-later.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-From 13f00eb4493c217269b76614759e452d8302955e Mon Sep 17 00:00:00 2001
-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.
----
- bin/automake.in | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/bin/automake.in b/bin/automake.in
-index a3a0aa318..2c8f31e14 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;
- }
- 
--- 
-2.13.1
-