diff options
| author | Michael Lauer <mickey@vanille-media.de> | 2008-02-29 15:59:47 +0000 |
|---|---|---|
| committer | Michael Lauer <mickey@vanille-media.de> | 2008-02-29 15:59:47 +0000 |
| commit | d8618d0ce0ee1bf7ad72efac9cbf5626a2897698 (patch) | |
| tree | fc29126a2695526378cef852bc57bf7b6d219df5 /packages/openttd/files/openttd_0.6.0-buildfix.patch | |
| parent | 5a362b4bb805986fbb4a5e0aee08d23b62d84b05 (diff) | |
| parent | 5e33f4db5f153d6b3e3cc9c75523e9ce9288e396 (diff) | |
merge of '7ebcf65940382b7ebea258189704cb0e4a77dc70'
and 'ae9980c1d055e682beb2fea6cfddb080c495b43b'
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` |