Ignore:
Timestamp:
2012-01-20T16:19:06+01:00 (4 years ago)
Author:
jow
Message:

[tools] autoconf: further relocation fixes

File:
1 edited

Legend:

Unmodified
Added
Removed
  • trunk/tools/autoconf/patches/000-relocatable.patch

    r29821 r29827  
    1111  
    1212   # Override SHELL.  On DJGPP SHELL may not be set to a shell 
     13@@ -51,7 +52,7 @@ use strict; 
     14 use vars qw ($config_h %verbatim %symbol); 
     15  
     16 # Lib files. 
     17-my $autom4te = $ENV{'AUTOM4TE'} || '@bindir@/@autom4te-name@'; 
     18+my $autom4te = $ENV{'AUTOM4TE'} || ($ENV{'STAGING_DIR'} ? $ENV{'STAGING_DIR'} . '/../host/bin/@autom4te-name@' : '@bindir@/@autom4te-name@'); 
     19 local $config_h; 
     20 my $config_h_in; 
     21 my @prepend_include; 
    1322--- a/bin/autom4te.in 
    1423+++ b/bin/autom4te.in 
     
    3342 # $LANGUAGE{LANGUAGE} -- Automatic options for LANGUAGE. 
    3443 my %language; 
     44@@ -88,7 +90,7 @@ my @include; 
     45 my $freeze = 0; 
     46  
     47 # $M4. 
     48-my $m4 = $ENV{"M4"} || '@M4@'; 
     49+my $m4 = $ENV{"M4"} || ($ENV{'STAGING_DIR'} ? $ENV{'STAGING_DIR'} . '/../host/bin/m4' : '@M4@'); 
     50 # Some non-GNU m4's don't reject the --help option, so give them /dev/null. 
     51 fatal "need GNU m4 1.4 or later: $m4" 
     52   if system "$m4 --help </dev/null 2>&1 | grep reload-state >/dev/null"; 
    3553--- a/bin/autoreconf.in 
    3654+++ b/bin/autoreconf.in 
     
    4563  
    4664   # Override SHELL.  On DJGPP SHELL may not be set to a shell 
     65@@ -107,9 +108,9 @@ Written by David J. MacKenzie and Akim D 
     66 "; 
     67  
     68 # Lib files. 
     69-my $autoconf   = $ENV{'AUTOCONF'}   || '@bindir@/@autoconf-name@'; 
     70-my $autoheader = $ENV{'AUTOHEADER'} || '@bindir@/@autoheader-name@'; 
     71-my $autom4te   = $ENV{'AUTOM4TE'}   || '@bindir@/@autom4te-name@'; 
     72+my $autoconf   = $ENV{'AUTOCONF'}   || ($ENV{'STAGING_DIR'} ? $ENV{'STAGING_DIR'} . '/../host/bin/@autoconf-name@' : '@bindir@/@autoconf-name@'); 
     73+my $autoheader = $ENV{'AUTOHEADER'} || ($ENV{'STAGING_DIR'} ? $ENV{'STAGING_DIR'} . '/../host/bin/@autoheader-name@' : '@bindir@/@autoheader-name@'); 
     74+my $autom4te   = $ENV{'AUTOM4TE'}   || ($ENV{'STAGING_DIR'} ? $ENV{'STAGING_DIR'} . '/../host/bin/@autom4te-name@' : '@bindir@/@autom4te-name@'); 
     75 my $automake   = $ENV{'AUTOMAKE'}   || 'automake'; 
     76 my $aclocal    = $ENV{'ACLOCAL'}    || 'aclocal'; 
     77 my $libtoolize = $ENV{'LIBTOOLIZE'} || 'libtoolize'; 
    4778--- a/bin/autoscan.in 
    4879+++ b/bin/autoscan.in 
     
    5788  
    5889   # Override SHELL.  On DJGPP SHELL may not be set to a shell 
    59 @@ -95,7 +96,7 @@ my $log; 
    60  my $autom4te = $ENV{'AUTOM4TE'} || '@bindir@/@autom4te-name@'; 
     90@@ -92,10 +93,10 @@ my $configure_scan = 'configure.scan'; 
     91 my $log; 
     92  
     93 # Autoconf and lib files. 
     94-my $autom4te = $ENV{'AUTOM4TE'} || '@bindir@/@autom4te-name@'; 
     95+my $autom4te = $ENV{'AUTOM4TE'} || ($ENV{'STAGING_DIR'} ? $ENV{'STAGING_DIR'} . '/../host/bin/@autom4te-name@' : '@bindir@/@autom4te-name@'); 
    6196 my $autoconf = "$autom4te --language=autoconf"; 
    6297 my @prepend_include; 
     
    78113  
    79114   # Override SHELL.  On DJGPP SHELL may not be set to a shell 
    80 @@ -51,7 +52,7 @@ my $autom4te = $ENV{'AUTOM4TE'} || '@bin 
     115@@ -51,10 +52,10 @@ my $autom4te = $ENV{'AUTOM4TE'} || '@bin 
    81116 my $autoconf = "$autom4te --language=autoconf"; 
    82117 # We need to find m4sugar. 
     
    86121 my $force = 0; 
    87122 # m4. 
    88  my $m4 = $ENV{"M4"} || '@M4@'; 
     123-my $m4 = $ENV{"M4"} || '@M4@'; 
     124+my $m4 = $ENV{"M4"} || ($ENV{'STAGING_DIR'} ? $ENV{'STAGING_DIR'} . '/../host/bin/m4' : '@M4@'); 
     125  
     126  
     127 # $HELP 
    89128--- a/bin/ifnames.in 
    90129+++ b/bin/ifnames.in 
Note: See TracChangeset for help on using the changeset viewer.