diff options
| author | Richard Purdie <rpurdie@rpsys.net> | 2008-02-21 13:23:49 +0000 |
|---|---|---|
| committer | Richard Purdie <rpurdie@rpsys.net> | 2008-02-21 13:23:49 +0000 |
| commit | bfb40c7751a3b668ad2b76b032d4d980b79e69e4 (patch) | |
| tree | 59fb28d656146552a342b86236b96adff8b943f3 /packages/openttd/files/openttd_0.6.0-buildfix.patch | |
| parent | 82f966b8c7ef4214975b5abd171d0bccc870ea1a (diff) | |
| parent | 0268cf3149698c86d71c219796a1219725ff1061 (diff) | |
merge of '501c67dde049332cb9a85285814cba121334c407'
and 'bf20fc7ee1fe9571699c9a63554b0f0ebb898921'
Diffstat (limited to 'packages/openttd/files/openttd_0.6.0-buildfix.patch')
| -rw-r--r-- | packages/openttd/files/openttd_0.6.0-buildfix.patch | 25 |
1 files changed, 25 insertions, 0 deletions
diff --git a/packages/openttd/files/openttd_0.6.0-buildfix.patch b/packages/openttd/files/openttd_0.6.0-buildfix.patch new file mode 100644 index 0000000000..d815cfc9c6 --- /dev/null +++ b/packages/openttd/files/openttd_0.6.0-buildfix.patch @@ -0,0 +1,25 @@ +Index: openttd-0.6.0-beta4/config.lib +=================================================================== +--- openttd-0.6.0-beta4.orig/config.lib 2008-02-20 20:24:58.000000000 +0100 ++++ openttd-0.6.0-beta4/config.lib 2008-02-20 20:26:55.000000000 +0100 +@@ -1255,7 +1255,7 @@ + if [ -z "$6" ]; then + compiler="$3" + else +- compiler="$3-$6" ++ compiler="$4" + fi + machine=`eval $compiler $9 2>/dev/null` + ret=$? +@@ -1271,11 +1271,6 @@ + exit 1 + fi + +- if [ "$machine" != "$3" ] && ( [ "$8" = "0" ] || [ "$8" = "1" ] ); then +- log 1 "checking $1... expected $3, found $machine" +- log 1 "the compiler suggests it doesn't build code for the machine you specified" +- exit 1 +- fi + elif [ -n "$4" ]; then + # Check for manual compiler + machine=`$4 $9 2>/dev/null` |