diff options
| author | Jo-Philipp Wich <jow@openwrt.org> | 2015-01-09 14:51:23 +0000 |
|---|---|---|
| committer | Jo-Philipp Wich <jow@openwrt.org> | 2015-01-09 14:51:23 +0000 |
| commit | cdaf75b641e6f55ed8de286d1db81d0338add315 (patch) | |
| tree | c555970f33f6a52a4e25df595f8d7cb75c9dd8c8 /tools/automake/patches | |
| parent | da9782f93591fc4856d9fed753a9ee0e3168ede8 (diff) | |
| download | upstream-cdaf75b641e6f55ed8de286d1db81d0338add315.tar.gz upstream-cdaf75b641e6f55ed8de286d1db81d0338add315.tar.bz2 upstream-cdaf75b641e6f55ed8de286d1db81d0338add315.zip | |
tools: automake: update to v1.15
Signed-off-by: Jo-Philipp Wich <jow@openwrt.org>
SVN-Revision: 43895
Diffstat (limited to 'tools/automake/patches')
| -rw-r--r-- | tools/automake/patches/000-relocatable.patch | 56 | ||||
| -rw-r--r-- | tools/automake/patches/100-aclocal-skip-not-existing-directories.patch | 16 |
2 files changed, 35 insertions, 37 deletions
diff --git a/tools/automake/patches/000-relocatable.patch b/tools/automake/patches/000-relocatable.patch index 1206fdc1cb..8e9ee37db4 100644 --- a/tools/automake/patches/000-relocatable.patch +++ b/tools/automake/patches/000-relocatable.patch @@ -1,17 +1,27 @@ ---- a/aclocal.in -+++ b/aclocal.in -@@ -27,7 +27,8 @@ +--- a/lib/Automake/Config.in ++++ b/lib/Automake/Config.in +@@ -32,7 +32,7 @@ our $PACKAGE = '@PACKAGE@'; + our $PACKAGE_BUGREPORT = '@PACKAGE_BUGREPORT@'; + our $VERSION = '@VERSION@'; + our $RELEASE_YEAR = '@RELEASE_YEAR@'; +-our $libdir = '@datadir@/@PACKAGE@-@APIVERSION@'; ++our $libdir = $ENV{'STAGING_DIR'} ? $ENV{'STAGING_DIR'} . '/../host/share/@PACKAGE@-@APIVERSION@' : '@datadir@/@PACKAGE@-@APIVERSION@'; + + our $perl_threads = 0; + # We need at least this version for CLONE support. +--- a/bin/aclocal.in ++++ b/bin/aclocal.in +@@ -27,7 +27,7 @@ eval 'case $# in 0) exec @PERL@ -S "$0"; BEGIN { -- my $perllibdir = $ENV{'perllibdir'} || '@datadir@/@PACKAGE@-@APIVERSION@'; -+ my $perllibdir = $ENV{'perllibdir'} || -+ ($ENV{'STAGING_DIR'} ? $ENV{'STAGING_DIR'} . '/../host/share/@PACKAGE@-@APIVERSION@' : '@datadir@/@PACKAGE@-@APIVERSION@'); - unshift @INC, (split '@PATH_SEPARATOR@', $perllibdir); +- @Aclocal::perl_libdirs = ('@datadir@/@PACKAGE@-@APIVERSION@') ++ @Aclocal::perl_libdirs = ($ENV{'STAGING_DIR'} ? $ENV{'STAGING_DIR'} . '/../host/share/@PACKAGE@-@APIVERSION@' : '@datadir@/@PACKAGE@-@APIVERSION@') + unless @Aclocal::perl_libdirs; + unshift @INC, @Aclocal::perl_libdirs; } - -@@ -58,8 +59,8 @@ - # ACLOCAL_PATH environment variable, and reset with the `--system-acdir' +@@ -69,8 +69,8 @@ $perl_threads = 0; + # ACLOCAL_PATH environment variable, and reset with the '--system-acdir' # option. my @user_includes = (); -my @automake_includes = ("@datadir@/aclocal-$APIVERSION"); @@ -21,26 +31,14 @@ # Whether we should copy M4 file in $user_includes[0]. my $install = 0; ---- a/automake.in -+++ b/automake.in -@@ -31,7 +31,8 @@ +--- a/bin/automake.in ++++ b/bin/automake.in +@@ -31,7 +31,7 @@ use strict; BEGIN { -- my $perllibdir = $ENV{'perllibdir'} || '@datadir@/@PACKAGE@-@APIVERSION@'; -+ my $perllibdir = $ENV{'perllibdir'} || -+ ($ENV{'STAGING_DIR'} ? $ENV{'STAGING_DIR'} . '/../host/share/@PACKAGE@-@APIVERSION@' : '@datadir@/@PACKAGE@-@APIVERSION@'); - unshift @INC, (split '@PATH_SEPARATOR@', $perllibdir); - - # Override SHELL. This is required on DJGPP so that system() uses ---- a/lib/Automake/Config.in -+++ b/lib/Automake/Config.in -@@ -31,7 +31,7 @@ - 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@; +- @Automake::perl_libdirs = ('@datadir@/@PACKAGE@-@APIVERSION@') ++ @Automake::perl_libdirs = ($ENV{'STAGING_DIR'} ? $ENV{'STAGING_DIR'} . '/../host/share/@PACKAGE@-@APIVERSION@' : '@datadir@/@PACKAGE@-@APIVERSION@') + unless @Automake::perl_libdirs; + unshift @INC, @Automake::perl_libdirs; - 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 e6c3d7f335..caaad084a4 100644 --- a/tools/automake/patches/100-aclocal-skip-not-existing-directories.patch +++ b/tools/automake/patches/100-aclocal-skip-not-existing-directories.patch @@ -1,15 +1,15 @@ ---- a/aclocal.in -+++ b/aclocal.in -@@ -327,6 +327,12 @@ +--- a/bin/aclocal.in ++++ b/bin/aclocal.in +@@ -354,6 +354,12 @@ sub scan_m4_dirs ($$@) foreach my $m4dir (@dirlist) { + if (! -d $m4dir) -+ { -+ msg ('override', "warning: skipping not existing directory `$m4dir'"); -+ next; -+ } ++ { ++ msg ('override', "warning: skipping not existing directory `$m4dir'"); ++ next; ++ } + if (! opendir (DIR, $m4dir)) { - if ($install && $type == FT_USER && $first_user_m4dir) + # TODO: maybe avoid complaining only if errno == ENONENT? |