01/01: gnu: supertuxkart: Fix build on aarch64.

[Efraim Flashner]

efraim pushed a commit to branch master
in repository guix.

commit 7ad2a4f1d50e5a397010ec90dba79feaca296a81
Author: Efraim Flashner <address@hidden>
Date:   Mon Jul 17 15:29:27 2017 +0300

    gnu: supertuxkart: Fix build on aarch64.
    
    * gnu/packages/games.scm (supertuxkart)[source]: Add patch.
    * gnu/packages/patches/supertuxkart-angelscript-ftbfs.patch: New file.
    * gnu/local.mk (dist_patch_DATA): Register it.
---
 gnu/local.mk                                       |  1 +
 gnu/packages/games.scm                             |  1 +
 .../patches/supertuxkart-angelscript-ftbfs.patch   | 42 ++++++++++++++++++++++
 3 files changed, 44 insertions(+)

diff --git a/gnu/local.mk b/gnu/local.mk
index 96e4b2d..8e3a52d 100644
--- a/gnu/local.mk
+++ b/gnu/local.mk
@@ -1012,6 +1012,7 @@ dist_patch_DATA =                                         
\
   %D%/packages/patches/spice-CVE-2017-7506.patch               \
   %D%/packages/patches/steghide-fixes.patch                    \
   %D%/packages/patches/superlu-dist-scotchmetis.patch          \
+  %D%/packages/patches/supertuxkart-angelscript-ftbfs.patch            \
   %D%/packages/patches/swish-e-search.patch                    \
   %D%/packages/patches/swish-e-format-security.patch           \
   %D%/packages/patches/synfigstudio-fix-ui-with-gtk3.patch     \
diff --git a/gnu/packages/games.scm b/gnu/packages/games.scm
index 2bef92b..2dec9a3 100644
--- a/gnu/packages/games.scm
+++ b/gnu/packages/games.scm
@@ -1386,6 +1386,7 @@ This game is based on the GPL version of the famous game 
TuxRacer.")
        (sha256
         (base32
          "10l2ljmd7mv8f9ylarqmxxryicdnph2qkm3g5maxnsm2k2q0n20b"))
+       (patches (search-patches "supertuxkart-angelscript-ftbfs.patch"))
        (modules '((guix build utils)))
        (snippet
         ;; Delete bundled library sources
diff --git a/gnu/packages/patches/supertuxkart-angelscript-ftbfs.patch 
b/gnu/packages/patches/supertuxkart-angelscript-ftbfs.patch
new file mode 100644
index 0000000..db3c568
--- /dev/null
+++ b/gnu/packages/patches/supertuxkart-angelscript-ftbfs.patch
@@ -0,0 +1,42 @@
+https://github.com/supertuxkart/stk-code/commit/5e05f1178ce6bc5f3a653b55ab3dc6d016196341.patch
+
+From 5e05f1178ce6bc5f3a653b55ab3dc6d016196341 Mon Sep 17 00:00:00 2001
+From: Deve <address@hidden>
+Date: Mon, 3 Oct 2016 23:26:09 +0200
+Subject: [PATCH] Fixed compiler error on Linux with non-x86 64bit platforms,
+ e.g. arm64, mips, and s390x architectures
+
+This modification is already applied in upstream angelscript repository:
+https://sourceforge.net/p/angelscript/code/2353/
+
+Thanks to Adrian Bunk and Andreas Jonsson
+---
+ lib/angelscript/projects/cmake/CMakeLists.txt | 1 +
+ lib/angelscript/source/as_config.h            | 2 +-
+ 2 files changed, 2 insertions(+), 1 deletion(-)
+
+diff --git a/lib/angelscript/projects/cmake/CMakeLists.txt 
b/lib/angelscript/projects/cmake/CMakeLists.txt
+index e93971315e..755d8378c3 100644
+--- a/lib/angelscript/projects/cmake/CMakeLists.txt
++++ b/lib/angelscript/projects/cmake/CMakeLists.txt
+@@ -67,6 +67,7 @@ set(ANGELSCRIPT_SOURCE
+     ../../source/as_builder.cpp
+     ../../source/as_bytecode.cpp
+     ../../source/as_callfunc.cpp
++    ../../source/as_callfunc_mips.cpp
+     ../../source/as_callfunc_x86.cpp
+     ../../source/as_callfunc_x64_gcc.cpp
+     ../../source/as_callfunc_x64_msvc.cpp
+diff --git a/lib/angelscript/source/as_config.h 
b/lib/angelscript/source/as_config.h
+index cb05bffbd5..5bb5b8e800 100644
+--- a/lib/angelscript/source/as_config.h
++++ b/lib/angelscript/source/as_config.h
+@@ -844,7 +844,7 @@
+                       #define THISCALL_PASS_OBJECT_POINTER_ON_THE_STACK
+                       #define AS_X86
+                       #undef AS_NO_THISCALL_FUNCTOR_METHOD
+-              #elif defined(__LP64__) && !defined(__arm64__)
++              #elif defined(__x86_64__)
+                       #define AS_X64_GCC
+                       #undef AS_NO_THISCALL_FUNCTOR_METHOD
+                       #define HAS_128_BIT_PRIMITIVES