diff options
| author | Jo-Philipp Wich <jow@openwrt.org> | 2012-01-28 04:42:15 +0000 |
|---|---|---|
| committer | Jo-Philipp Wich <jow@openwrt.org> | 2012-01-28 04:42:15 +0000 |
| commit | 388166a051d057b4a15de2a0f54cd7b5714533ea (patch) | |
| tree | f24a337d430720047b1dcc26391a587626eb3b44 /tools | |
| parent | 42b6794ef81de411c3d5497a5954f0ddc2e7c84f (diff) | |
| download | upstream-388166a051d057b4a15de2a0f54cd7b5714533ea.tar.gz upstream-388166a051d057b4a15de2a0f54cd7b5714533ea.tar.bz2 upstream-388166a051d057b4a15de2a0f54cd7b5714533ea.zip | |
[tools] autoconf: another relocatability fix for autom4te, substitute hardcoded prefix with $STAGING_DIR when reading autom4te.cfg
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@29931 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'tools')
| -rw-r--r-- | tools/autoconf/patches/000-relocatable.patch | 13 |
1 files changed, 13 insertions, 0 deletions
diff --git a/tools/autoconf/patches/000-relocatable.patch b/tools/autoconf/patches/000-relocatable.patch index 98661e2002..0b83a2b44c 100644 --- a/tools/autoconf/patches/000-relocatable.patch +++ b/tools/autoconf/patches/000-relocatable.patch @@ -50,6 +50,19 @@ # 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"; +@@ -270,6 +272,12 @@ sub load_configuration ($) + + my @words = shellwords ($_); + my $type = shift @words; ++ ++ if ($ENV{'STAGING_DIR'}) ++ { ++ @words = map { s!^@pkgdatadir@!$ENV{'STAGING_DIR'}/../host/share/autoconf!; $_ } @words; ++ } ++ + if ($type eq 'begin-language:') + { + fatal "$file:$.: end-language missing for: $lang" --- a/bin/autoreconf.in +++ b/bin/autoreconf.in @@ -27,7 +27,8 @@ eval 'case $# in 0) exec @PERL@ -S "$0"; |