From eee80d2552c3f25f4e10c45277f2e6a9084cb162 Mon Sep 17 00:00:00 2001 From: Robert Schuster Date: Thu, 4 Dec 2008 19:09:17 +0100 Subject: openttd: Updated to 0.6.3. --- .../openttd/files/openttd_0.6.2-buildfix.patch | 25 ---------------------- .../openttd/files/openttd_0.6.3-buildfix.patch | 25 ++++++++++++++++++++++ packages/openttd/openttd_0.6.2.bb | 9 -------- packages/openttd/openttd_0.6.3.bb | 9 ++++++++ 4 files changed, 34 insertions(+), 34 deletions(-) delete mode 100644 packages/openttd/files/openttd_0.6.2-buildfix.patch create mode 100644 packages/openttd/files/openttd_0.6.3-buildfix.patch delete mode 100644 packages/openttd/openttd_0.6.2.bb create mode 100644 packages/openttd/openttd_0.6.3.bb (limited to 'packages/openttd') diff --git a/packages/openttd/files/openttd_0.6.2-buildfix.patch b/packages/openttd/files/openttd_0.6.2-buildfix.patch deleted file mode 100644 index 483ff492a9..0000000000 --- a/packages/openttd/files/openttd_0.6.2-buildfix.patch +++ /dev/null @@ -1,25 +0,0 @@ -Index: openttd-0.6.2/config.lib -=================================================================== ---- openttd-0.6.2.orig/config.lib 2008-08-02 01:52:22.000000000 +0200 -+++ openttd-0.6.2/config.lib 2008-09-23 08:57:53.000000000 +0200 -@@ -1247,7 +1247,7 @@ - if [ -z "$6" ]; then - compiler="$3" - else -- compiler="$3-$6" -+ compiler="$4" - fi - machine=`eval $compiler $9 2>/dev/null` - ret=$? -@@ -1263,11 +1263,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` diff --git a/packages/openttd/files/openttd_0.6.3-buildfix.patch b/packages/openttd/files/openttd_0.6.3-buildfix.patch new file mode 100644 index 0000000000..c0ac8f1945 --- /dev/null +++ b/packages/openttd/files/openttd_0.6.3-buildfix.patch @@ -0,0 +1,25 @@ +Index: openttd-0.6.3/config.lib +=================================================================== +--- openttd-0.6.3.orig/config.lib 2008-10-01 19:00:50.000000000 +0200 ++++ openttd-0.6.3/config.lib 2008-12-04 19:04:29.000000000 +0100 +@@ -1341,7 +1341,7 @@ + if [ -z "$6" ]; then + compiler="$3" + else +- compiler="$3-$6" ++ compiler="$4" + fi + machine=`eval $compiler $9 2>/dev/null` + ret=$? +@@ -1357,11 +1357,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` diff --git a/packages/openttd/openttd_0.6.2.bb b/packages/openttd/openttd_0.6.2.bb deleted file mode 100644 index a8a06738f4..0000000000 --- a/packages/openttd/openttd_0.6.2.bb +++ /dev/null @@ -1,9 +0,0 @@ -require openttd.inc - -PR = "r0" - -# When upgrading this recipe make sure to refresh this patch. -SRC_URI += "file://openttd_${PV}-buildfix.patch;patch=1" - - - diff --git a/packages/openttd/openttd_0.6.3.bb b/packages/openttd/openttd_0.6.3.bb new file mode 100644 index 0000000000..a8a06738f4 --- /dev/null +++ b/packages/openttd/openttd_0.6.3.bb @@ -0,0 +1,9 @@ +require openttd.inc + +PR = "r0" + +# When upgrading this recipe make sure to refresh this patch. +SRC_URI += "file://openttd_${PV}-buildfix.patch;patch=1" + + + -- cgit 1.2.3-korg