projects
/
openwrt
/
.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
537164c
)
autoconf: another relocatability fix for autom4te, substitute hardcoded prefix with...
author
Jo-Philipp Wich
<jow@openwrt.org>
Sat, 28 Jan 2012 04:42:15 +0000
(
04:42
+0000)
committer
Jo-Philipp Wich
<jow@openwrt.org>
Sat, 28 Jan 2012 04:42:15 +0000
(
04:42
+0000)
SVN-Revision: 29931
tools/autoconf/patches/000-relocatable.patch
patch
|
blob
|
history
diff --git
a/tools/autoconf/patches/000-relocatable.patch
b/tools/autoconf/patches/000-relocatable.patch
index 98661e20023f3a8728b823bf8317cb0c5badfdc3..0b83a2b44c39c74d5358dcb1aa93ba0669352ac3 100644
(file)
--- 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";
# 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";
--- a/bin/autoreconf.in
+++ b/bin/autoreconf.in
@@ -27,7 +27,8 @@ eval 'case $# in 0) exec @PERL@ -S "$0";