aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorFlorian Fainelli <florian@openwrt.org>2012-04-02 16:25:28 +0000
committerFlorian Fainelli <florian@openwrt.org>2012-04-02 16:25:28 +0000
commit093b12cba9237e9233217ee59d7ac0568f0bc673 (patch)
treed98e6feb309ed1f3b998e6e071de63a1aed7d63c
parent9c6d6caf0ec83a0919b2cf5a4c56c06f03da39a5 (diff)
downloadupstream-093b12cba9237e9233217ee59d7ac0568f0bc673.tar.gz
upstream-093b12cba9237e9233217ee59d7ac0568f0bc673.tar.bz2
upstream-093b12cba9237e9233217ee59d7ac0568f0bc673.zip
automake: update to 1.11.3
Signed-off-by: Luka Perkov <openwrt@lukaperkov.net> SVN-Revision: 31173
-rw-r--r--tools/automake/Makefile6
-rw-r--r--tools/automake/patches/000-relocatable.patch14
-rw-r--r--tools/automake/patches/100-aclocal-skip-not-existing-directories.patch2
3 files changed, 11 insertions, 11 deletions
diff --git a/tools/automake/Makefile b/tools/automake/Makefile
index c30a9900e6..63d28bd48b 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 3255b97518..827797c732 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 cc1f49d519..7829d0ecde 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)
{