hak5
/
wifipineapple-openwrt
mirror of https://github.com/hak5/wifipineapple-openwrt.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

[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
master
Florian Fainelli 2012-04-02 16:25:28 +00:00
parent bb5b1e477d
commit 89402917b2
3 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
tools/automake/Makefile
View File

@ -7,11 +7,11 @@
include $(TOPDIR)/rules.mk include $(TOPDIR)/rules.mk
PKG_NAME:=automake 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_SOURCE_URL:=@GNU/automake
PKG_MD5SUM:=c2972c4d9b3e29c03d5f2af86249876f PKG_MD5SUM:=3d72b2076eb4397ad5e9a2aace6357fd
include $(INCLUDE_DIR)/host-build.mk include $(INCLUDE_DIR)/host-build.mk

14
tools/automake/patches/000-relocatable.patch
View File

@ -1,6 +1,6 @@
--- a/aclocal.in --- a/aclocal.in
+++ b/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 BEGIN
{ {
@ -10,9 +10,9 @@
unshift @INC, (split '@PATH_SEPARATOR@', $perllibdir); unshift @INC, (split '@PATH_SEPARATOR@', $perllibdir);
} }
@@ -57,8 +58,8 @@ $perl_threads = 0; @@ -61,8 +62,8 @@ $perl_threads = 0;
# @system_includes can be augmented with the `dirlist' file. Also # ACLOCAL_PATH environment variable, and reset with the `--system-acdir'
# --acdir will reset both @automake_includes and @system_includes. # option.
my @user_includes = (); my @user_includes = ();
-my @automake_includes = ("@datadir@/aclocal-$APIVERSION"); -my @automake_includes = ("@datadir@/aclocal-$APIVERSION");
-my @system_includes = ('@datadir@/aclocal'); -my @system_includes = ('@datadir@/aclocal');
@ -35,12 +35,12 @@
# Override SHELL. This is required on DJGPP so that system() uses # Override SHELL. This is required on DJGPP so that system() uses
--- a/lib/Automake/Config.in --- a/lib/Automake/Config.in
+++ b/lib/Automake/Config.in +++ b/lib/Automake/Config.in
@@ -28,7 +28,7 @@ our @EXPORT = qw ($APIVERSION $PACKAGE $ @@ -31,7 +31,7 @@ our $APIVERSION = '@APIVERSION@';
our $APIVERSION = '@APIVERSION@';
our $PACKAGE = '@PACKAGE@'; our $PACKAGE = '@PACKAGE@';
our $PACKAGE_BUGREPORT = '@PACKAGE_BUGREPORT@';
our $VERSION = '@VERSION@'; our $VERSION = '@VERSION@';
-our $libdir = '@datadir@/@PACKAGE@-@APIVERSION@'; -our $libdir = '@datadir@/@PACKAGE@-@APIVERSION@';
+our $libdir = $ENV{'STAGING_DIR'} ? $ENV{'STAGING_DIR'} . '/../host/share/@PACKAGE@-@APIVERSION@' : '@datadir@/@PACKAGE@-@APIVERSION@'; +our $libdir = $ENV{'STAGING_DIR'} ? $ENV{'STAGING_DIR'} . '/../host/share/@PACKAGE@-@APIVERSION@' : '@datadir@/@PACKAGE@-@APIVERSION@';
our $perl_threads = @PERL_THREADS@; our $perl_threads = @PERL_THREADS@;
1;; 1;

2
tools/automake/patches/100-aclocal-skip-not-existing-directories.patch
View File

@ -1,6 +1,6 @@
--- a/aclocal.in --- a/aclocal.in
+++ b/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) foreach my $m4dir (@dirlist)
{ {