From b13f617e47029acd2f5ee70732131ea4652598d3 Mon Sep 17 00:00:00 2001
From: florian <florian@3c298f89-4303-0410-b956-a3cf2f4a3e73>
Date: Mon, 2 Apr 2012 16:25:28 +0000
Subject: [PATCH] [tools] automake: update to 1.11.3
Signed-off-by: Luka Perkov <openwrt@lukaperkov.net>
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@31173 3c298f89-4303-0410-b956-a3cf2f4a3e73
---
tools/automake/Makefile | 6 +++---
tools/automake/patches/000-relocatable.patch | 14 +++++++-------
...100-aclocal-skip-not-existing-directories.patch | 2 +-
3 files changed, 11 insertions(+), 11 deletions(-)
diff --git a/tools/automake/Makefile b/tools/automake/Makefile
index c30a9900e..63d28bd48 100644
--- a/tools/automake/Makefile
+++ b/tools/automake/Makefile
@@ -7,11 +7,11 @@
include $(TOPDIR)/rules.mk
PKG_NAME:=automake
-PKG_VERSION:=1.11.1
+PKG_VERSION:=1.11.3
-PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2
+PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.xz
PKG_SOURCE_URL:=@GNU/automake
-PKG_MD5SUM:=c2972c4d9b3e29c03d5f2af86249876f
+PKG_MD5SUM:=3d72b2076eb4397ad5e9a2aace6357fd
include $(INCLUDE_DIR)/host-build.mk
diff --git a/tools/automake/patches/000-relocatable.patch b/tools/automake/patches/000-relocatable.patch
index 3255b9751..827797c73 100644
--- a/tools/automake/patches/000-relocatable.patch
+++ b/tools/automake/patches/000-relocatable.patch
@@ -1,6 +1,6 @@
--- a/aclocal.in
+++ b/aclocal.in
-@@ -28,7 +28,8 @@ eval 'case $# in 0) exec @PERL@ -S "$0";
+@@ -29,7 +29,8 @@ eval 'case $# in 0) exec @PERL@ -S "$0";
BEGIN
{
@@ -10,9 +10,9 @@
unshift @INC, (split '@PATH_SEPARATOR@', $perllibdir);
}
-@@ -57,8 +58,8 @@ $perl_threads = 0;
- # @system_includes can be augmented with the `dirlist' file. Also
- # --acdir will reset both @automake_includes and @system_includes.
+@@ -61,8 +62,8 @@ $perl_threads = 0;
+ # ACLOCAL_PATH environment variable, and reset with the `--system-acdir'
+ # option.
my @user_includes = ();
-my @automake_includes = ("@datadir@/aclocal-$APIVERSION");
-my @system_includes = ('@datadir@/aclocal');
@@ -35,12 +35,12 @@
# Override SHELL. This is required on DJGPP so that system() uses
--- a/lib/Automake/Config.in
+++ b/lib/Automake/Config.in
-@@ -28,7 +28,7 @@ our @EXPORT = qw ($APIVERSION $PACKAGE $
- our $APIVERSION = '@APIVERSION@';
+@@ -31,7 +31,7 @@ our $APIVERSION = '@APIVERSION@';
our $PACKAGE = '@PACKAGE@';
+ our $PACKAGE_BUGREPORT = '@PACKAGE_BUGREPORT@';
our $VERSION = '@VERSION@';
-our $libdir = '@datadir@/@PACKAGE@-@APIVERSION@';
+our $libdir = $ENV{'STAGING_DIR'} ? $ENV{'STAGING_DIR'} . '/../host/share/@PACKAGE@-@APIVERSION@' : '@datadir@/@PACKAGE@-@APIVERSION@';
our $perl_threads = @PERL_THREADS@;
- 1;;
+ 1;
diff --git a/tools/automake/patches/100-aclocal-skip-not-existing-directories.patch b/tools/automake/patches/100-aclocal-skip-not-existing-directories.patch
index cc1f49d51..7829d0ecd 100644
--- a/tools/automake/patches/100-aclocal-skip-not-existing-directories.patch
+++ b/tools/automake/patches/100-aclocal-skip-not-existing-directories.patch
@@ -1,6 +1,6 @@
--- a/aclocal.in
+++ b/aclocal.in
-@@ -310,6 +310,12 @@ sub scan_m4_dirs ($@)
+@@ -314,6 +314,12 @@ sub scan_m4_dirs ($@)
foreach my $m4dir (@dirlist)
{
--
2.20.1