diff options
Diffstat (limited to 'tools/automake/patches/000-relocatable.patch')
| -rw-r--r-- | tools/automake/patches/000-relocatable.patch | 56 |
1 files changed, 27 insertions, 29 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; |