KumiSystems/openwrtv3
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

autoconf: further relocation fixes

Browse source 
SVN-Revision: 29827
This commit is contained in:
Jo-Philipp Wich 2012-01-20 15:19:06 +00:00
parent b446876387
commit fccdc995da
1 changed files with 43 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

47
tools/autoconf/patches/000-relocatable.patch
View file

@ -10,6 +10,15 @@
unshift @INC, "$pkgdatadir"; unshift @INC, "$pkgdatadir";
# Override SHELL. On DJGPP SHELL may not be set to a shell # Override SHELL. On DJGPP SHELL may not be set to a shell
@@ -51,7 +52,7 @@ use strict;
use vars qw ($config_h %verbatim %symbol);
# Lib files.
-my $autom4te = $ENV{'AUTOM4TE'} || '@bindir@/@autom4te-name@';
+my $autom4te = $ENV{'AUTOM4TE'} || ($ENV{'STAGING_DIR'} ? $ENV{'STAGING_DIR'} . '/../host/bin/@autom4te-name@' : '@bindir@/@autom4te-name@');
local $config_h;
my $config_h_in;
my @prepend_include;
--- a/bin/autom4te.in --- a/bin/autom4te.in
+++ b/bin/autom4te.in +++ b/bin/autom4te.in
@@ -25,7 +25,8 @@ eval 'case $# in 0) exec @PERL@ -S "$0"; @@ -25,7 +25,8 @@ eval 'case $# in 0) exec @PERL@ -S "$0";
@ -32,6 +41,15 @@
# $LANGUAGE{LANGUAGE} -- Automatic options for LANGUAGE. # $LANGUAGE{LANGUAGE} -- Automatic options for LANGUAGE.
my %language; my %language;
@@ -88,7 +90,7 @@ my @include;
my $freeze = 0;
# $M4.
-my $m4 = $ENV{"M4"} || '@M4@';
+my $m4 = $ENV{"M4"} || ($ENV{'STAGING_DIR'} ? $ENV{'STAGING_DIR'} . '/../host/bin/m4' : '@M4@');
# Some non-GNU m4's don't reject the --help option, so give them /dev/null.
fatal "need GNU m4 1.4 or later: $m4"
if system "$m4 --help </dev/null 2>&1 | grep reload-state >/dev/null";
--- a/bin/autoreconf.in --- a/bin/autoreconf.in
+++ b/bin/autoreconf.in +++ b/bin/autoreconf.in
@@ -27,7 +27,8 @@ eval 'case $# in 0) exec @PERL@ -S "$0"; @@ -27,7 +27,8 @@ eval 'case $# in 0) exec @PERL@ -S "$0";
@ -44,6 +62,19 @@
unshift @INC, $pkgdatadir; unshift @INC, $pkgdatadir;
# Override SHELL. On DJGPP SHELL may not be set to a shell # Override SHELL. On DJGPP SHELL may not be set to a shell
@@ -107,9 +108,9 @@ Written by David J. MacKenzie and Akim D
";
# Lib files.
-my $autoconf = $ENV{'AUTOCONF'} || '@bindir@/@autoconf-name@';
-my $autoheader = $ENV{'AUTOHEADER'} || '@bindir@/@autoheader-name@';
-my $autom4te = $ENV{'AUTOM4TE'} || '@bindir@/@autom4te-name@';
+my $autoconf = $ENV{'AUTOCONF'} || ($ENV{'STAGING_DIR'} ? $ENV{'STAGING_DIR'} . '/../host/bin/@autoconf-name@' : '@bindir@/@autoconf-name@');
+my $autoheader = $ENV{'AUTOHEADER'} || ($ENV{'STAGING_DIR'} ? $ENV{'STAGING_DIR'} . '/../host/bin/@autoheader-name@' : '@bindir@/@autoheader-name@');
+my $autom4te = $ENV{'AUTOM4TE'} || ($ENV{'STAGING_DIR'} ? $ENV{'STAGING_DIR'} . '/../host/bin/@autom4te-name@' : '@bindir@/@autom4te-name@');
my $automake = $ENV{'AUTOMAKE'} || 'automake';
my $aclocal = $ENV{'ACLOCAL'} || 'aclocal';
my $libtoolize = $ENV{'LIBTOOLIZE'} || 'libtoolize';
--- a/bin/autoscan.in --- a/bin/autoscan.in
+++ b/bin/autoscan.in +++ b/bin/autoscan.in
@@ -26,7 +26,8 @@ eval 'case $# in 0) exec @PERL@ -S "$0"; @@ -26,7 +26,8 @@ eval 'case $# in 0) exec @PERL@ -S "$0";
@ -56,8 +87,12 @@
unshift @INC, $pkgdatadir; unshift @INC, $pkgdatadir;
# Override SHELL. On DJGPP SHELL may not be set to a shell # Override SHELL. On DJGPP SHELL may not be set to a shell
@@ -95,7 +96,7 @@ my $log; @@ -92,10 +93,10 @@ my $configure_scan = 'configure.scan';
my $autom4te = $ENV{'AUTOM4TE'} || '@bindir@/@autom4te-name@'; my $log;
# Autoconf and lib files.
-my $autom4te = $ENV{'AUTOM4TE'} || '@bindir@/@autom4te-name@';
+my $autom4te = $ENV{'AUTOM4TE'} || ($ENV{'STAGING_DIR'} ? $ENV{'STAGING_DIR'} . '/../host/bin/@autom4te-name@' : '@bindir@/@autom4te-name@');
my $autoconf = "$autom4te --language=autoconf"; my $autoconf = "$autom4te --language=autoconf";
my @prepend_include; my @prepend_include;
-my @include = ('@pkgdatadir@'); -my @include = ('@pkgdatadir@');
@ -77,7 +112,7 @@
unshift @INC, $pkgdatadir; unshift @INC, $pkgdatadir;
# Override SHELL. On DJGPP SHELL may not be set to a shell # Override SHELL. On DJGPP SHELL may not be set to a shell
@@ -51,7 +52,7 @@ my $autom4te = $ENV{'AUTOM4TE'} || '@bin @@ -51,10 +52,10 @@ my $autom4te = $ENV{'AUTOM4TE'} || '@bin
my $autoconf = "$autom4te --language=autoconf"; my $autoconf = "$autom4te --language=autoconf";
# We need to find m4sugar. # We need to find m4sugar.
my @prepend_include; my @prepend_include;
@ -85,7 +120,11 @@
+my @include = ($ENV{'STAGING_DIR'} ? $ENV{'STAGING_DIR'} . '/../host/share/autoconf' : '@pkgdatadir@'); +my @include = ($ENV{'STAGING_DIR'} ? $ENV{'STAGING_DIR'} . '/../host/share/autoconf' : '@pkgdatadir@');
my $force = 0; my $force = 0;
# m4. # m4.
my $m4 = $ENV{"M4"} || '@M4@'; -my $m4 = $ENV{"M4"} || '@M4@';
+my $m4 = $ENV{"M4"} || ($ENV{'STAGING_DIR'} ? $ENV{'STAGING_DIR'} . '/../host/bin/m4' : '@M4@');
# $HELP
--- a/bin/ifnames.in --- a/bin/ifnames.in
+++ b/bin/ifnames.in +++ b/bin/ifnames.in
@@ -31,7 +31,8 @@ eval 'case $# in 0) exec @PERL@ -S "$0"; @@ -31,7 +31,8 @@ eval 'case $# in 0) exec @PERL@ -S "$0";