Bug#1033901: unblock: castle-game-engine/7.0~alpha.2+dfsg1-4
Package: release.debian.org
Severity: normal
User: release.debian.org@packages.debian.org
Usertags: unblock
Please unblock package castle-game-engine
[ Reason ]
Fix compilation on mipsel architecture (Closes: Bug#891683)
[ Impact ]
No impact on other architectures. Fixes the compilation on mipsel.
[ Tests ]
The test suite was running on other architectures and will run on mipsel.
[ Risks ]
Probably none.
[ Checklist ]
[x] all changes are documented in the d/changelog
[x] I reviewed all changes and I approve them
[x] attach debdiff against the package in testing
[ Other info ]
This will allow to bring mipsel to the supported architectures while not
impacting at all any other architecture.
The changes are just fixing compilation directives that are specific to mips
and mipsel.
unblock castle-game-engine/7.0~alpha.2+dfsg1-4
diff -Nru castle-game-engine-7.0~alpha.2+dfsg1/debian/changelog castle-game-engine-7.0~alpha.2+dfsg1/debian/changelog
--- castle-game-engine-7.0~alpha.2+dfsg1/debian/changelog 2023-04-02 16:44:18.000000000 +0200
+++ castle-game-engine-7.0~alpha.2+dfsg1/debian/changelog 2023-04-03 15:07:29.000000000 +0200
@@ -1,3 +1,11 @@
+castle-game-engine (7.0~alpha.2+dfsg1-4) unstable; urgency=medium
+
+ * Fixed compilation on mipsel.
+ On mipsel both CPUmips and CPUmipsel are defined by the compiler.
+ (Closes: Bug#891683)
+
+ -- Abou Al Montacir <abou.almontacir@sfr.fr> Mon, 03 Apr 2023 15:07:29 +0200
+
castle-game-engine (7.0~alpha.2+dfsg1-3) unstable; urgency=medium
* Removed unused binary files to fix lintian reported errors.
diff -Nru castle-game-engine-7.0~alpha.2+dfsg1/debian/patches/Fixed-compilation-on-mipsel.patch castle-game-engine-7.0~alpha.2+dfsg1/debian/patches/Fixed-compilation-on-mipsel.patch
--- castle-game-engine-7.0~alpha.2+dfsg1/debian/patches/Fixed-compilation-on-mipsel.patch 1970-01-01 01:00:00.000000000 +0100
+++ castle-game-engine-7.0~alpha.2+dfsg1/debian/patches/Fixed-compilation-on-mipsel.patch 2023-04-03 15:04:37.000000000 +0200
@@ -0,0 +1,22 @@
+Description: Fixed compilation on mipsel
+ This patch fixes a bug causing CGE not compile on mipsel architecture.
+ .
+ The issue was that on mipsel both CPUmips and CPUmipsel are defined by the
+ compiler.
+Author: Abou Al Montacir <abou.almotacir@sfr.fr>
+
+diff --git a/tools/common-code/toolarchitectures.pas b/tools/common-code/toolarchitectures.pas
+index 905fa46..9ae4e07 100644
+--- a/tools/common-code/toolarchitectures.pas
++++ b/tools/common-code/toolarchitectures.pas
+@@ -138,8 +138,8 @@ const
+ {$ifdef CPUpowerpc64} powerpc64 {$endif}
+ {$ifdef CPUavr} avr {$endif}
+ {$ifdef CPUarmeb} armeb {$endif}
+- {$ifdef CPUmips} mips {$endif}
+- {$ifdef CPUmipsel} mipsel {$endif}
++ {$ifdef CPUmipsel} mipsel {$else}
++ {$ifdef CPUmips} mips {$endif}{$endif}
+ {$ifdef CPUjvm} jvm {$endif}
+ {$ifdef CPUi8086} i8086 {$endif}
+ {$ifdef CPUsparc64} sparc64 {$endif}
diff -Nru castle-game-engine-7.0~alpha.2+dfsg1/debian/patches/series castle-game-engine-7.0~alpha.2+dfsg1/debian/patches/series
--- castle-game-engine-7.0~alpha.2+dfsg1/debian/patches/series 2022-10-24 20:06:20.000000000 +0200
+++ castle-game-engine-7.0~alpha.2+dfsg1/debian/patches/series 2023-04-03 08:43:08.000000000 +0200
@@ -7,3 +7,4 @@
77c97ef135eb5ad95c05d90edae11fa3d2863359.patch
Fix-UTF-8-BOM.patch
f0fe0583dded3d0c27ae46fde59a00f58a777e46.patch
+Fixed-compilation-on-mipsel.patch
Reply to: