tools/autoconf/patches/000-relocatable.patch

   1 --- a/bin/autoheader.in
   2 +++ b/bin/autoheader.in
   3 @@ -29,7 +29,8 @@ eval 'case $# in 0) exec @PERL@ -S "$0";
   4
   5  BEGIN
   6  {
   7 -  my $pkgdatadir = $ENV{'autom4te_perllibdir'} || '@pkgdatadir@';
   8 +  my $pkgdatadir = $ENV{'autom4te_perllibdir'} ||
   9 +       ($ENV{'STAGING_DIR'} ? $ENV{'STAGING_DIR'} . '/../host/share/autoconf' : '@pkgdatadir@');
  10    unshift @INC, "$pkgdatadir";
  11
  12    # 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;
  22 --- a/bin/autom4te.in
  23 +++ b/bin/autom4te.in
  24 @@ -25,7 +25,8 @@ eval 'case $# in 0) exec @PERL@ -S "$0";
  25
  26  BEGIN
  27  {
  28 -  my $pkgdatadir = $ENV{'autom4te_perllibdir'} || '@pkgdatadir@';
  29 +  my $pkgdatadir = $ENV{'autom4te_perllibdir'} ||
  30 +       ($ENV{'STAGING_DIR'} ? $ENV{'STAGING_DIR'} . '/../host/share/autoconf' : '@pkgdatadir@');
  31    unshift @INC, $pkgdatadir;
  32
  33    # Override SHELL.  On DJGPP SHELL may not be set to a shell
  34 @@ -45,7 +46,8 @@ use File::Basename;
  35  use strict;
  36
  37  # Data directory.
  38 -my $pkgdatadir = $ENV{'AC_MACRODIR'} || '@pkgdatadir@';
  39 +my $pkgdatadir = $ENV{'AC_MACRODIR'} ||
  40 +       ($ENV{'STAGING_DIR'} ? $ENV{'STAGING_DIR'} . '/../host/share/autoconf' : '@pkgdatadir@');
  41
  42  # $LANGUAGE{LANGUAGE} -- Automatic options for LANGUAGE.
  43  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";
  53 --- a/bin/autoreconf.in
  54 +++ b/bin/autoreconf.in
  55 @@ -27,7 +27,8 @@ eval 'case $# in 0) exec @PERL@ -S "$0";
  56
  57  BEGIN
  58  {
  59 -  my $pkgdatadir = $ENV{'autom4te_perllibdir'} || '@pkgdatadir@';
  60 +  my $pkgdatadir = $ENV{'autom4te_perllibdir'} ||
  61 +       ($ENV{'STAGING_DIR'} ? $ENV{'STAGING_DIR'} . '/../host/share/autoconf' : '@pkgdatadir@');
  62    unshift @INC, $pkgdatadir;
  63
  64    # 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';
  78 --- a/bin/autoscan.in
  79 +++ b/bin/autoscan.in
  80 @@ -26,7 +26,8 @@ eval 'case $# in 0) exec @PERL@ -S "$0";
  81
  82  BEGIN
  83  {
  84 -  my $pkgdatadir = $ENV{'autom4te_perllibdir'} || '@pkgdatadir@';
  85 +  my $pkgdatadir = $ENV{'autom4te_perllibdir'} ||
  86 +       ($ENV{'STAGING_DIR'} ? $ENV{'STAGING_DIR'} . '/../host/share/autoconf' : '@pkgdatadir@');
  87    unshift @INC, $pkgdatadir;
  88
  89    # Override SHELL.  On DJGPP SHELL may not be set to a shell
  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@');
  96  my $autoconf = "$autom4te --language=autoconf";
  97  my @prepend_include;
  98 -my @include = ('@pkgdatadir@');
  99 +my @include = ($ENV{'STAGING_DIR'} ? $ENV{'STAGING_DIR'} . '/../host/share/autoconf' : '@pkgdatadir@');
 100
 101  # $help
 102  # -----
 103 --- a/bin/autoupdate.in
 104 +++ b/bin/autoupdate.in
 105 @@ -27,7 +27,8 @@ eval 'case $# in 0) exec @PERL@ -S "$0";
 106
 107  BEGIN
 108  {
 109 -  my $pkgdatadir = $ENV{'autom4te_perllibdir'} || '@pkgdatadir@';
 110 +  my $pkgdatadir = $ENV{'autom4te_perllibdir'} ||
 111 +       ($ENV{'STAGING_DIR'} ? $ENV{'STAGING_DIR'} . '/../host/share/autoconf' : '@pkgdatadir@');
 112    unshift @INC, $pkgdatadir;
 113
 114    # Override SHELL.  On DJGPP SHELL may not be set to a shell
 115 @@ -51,10 +52,10 @@ my $autom4te = $ENV{'AUTOM4TE'} || '@bin
 116  my $autoconf = "$autom4te --language=autoconf";
 117  # We need to find m4sugar.
 118  my @prepend_include;
 119 -my @include = ('@pkgdatadir@');
 120 +my @include = ($ENV{'STAGING_DIR'} ? $ENV{'STAGING_DIR'} . '/../host/share/autoconf' : '@pkgdatadir@');
 121  my $force = 0;
 122  # 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
 128 --- a/bin/ifnames.in
 129 +++ b/bin/ifnames.in
 130 @@ -31,7 +31,8 @@ eval 'case $# in 0) exec @PERL@ -S "$0";
 131
 132  BEGIN
 133  {
 134 -  my $pkgdatadir = $ENV{'autom4te_perllibdir'} || '@pkgdatadir@';
 135 +  my $pkgdatadir = $ENV{'autom4te_perllibdir'} ||
 136 +       ($ENV{'STAGING_DIR'} ? $ENV{'STAGING_DIR'} . '/../host/share/autoconf' : '@pkgdatadir@');
 137    unshift @INC, $pkgdatadir;
 138
 139    # Override SHELL.  On DJGPP SHELL may not be set to a shell
 140 --- a/bin/autoconf.as
 141 +++ b/bin/autoconf.as
 142 @@ -85,7 +85,11 @@ exit_missing_arg='
 143  # restore font-lock: '
 144
 145  # Variables.
 146 -: ${AUTOM4TE='@bindir@/@autom4te-name@'}
 147 +if test -n "$STAGING_DIR"; then
 148 +       : ${AUTOM4TE="$STAGING_DIR/../host/bin/@autom4te-name@"}
 149 +else
 150 +       : ${AUTOM4TE='@bindir@/@autom4te-name@'}
 151 +fi
 152  autom4te_options=
 153  outfile=
 154  verbose=false