r15428 - in packages/trunk/supertuxkart/debian: . patches

[Vincent Cheng]

Author: vcheng
Date: 2015-05-18 05:07:12 +0000 (Mon, 18 May 2015)
New Revision: 15428

Added:
   packages/trunk/supertuxkart/debian/patches/fix_angelscript_build_on_non-x86_arches.patch
Modified:
   packages/trunk/supertuxkart/debian/changelog
   packages/trunk/supertuxkart/debian/patches/series
Log:
add fix_angelscript_build_on_non-x86_arches.patch to fix non-x86 FTBFS


Modified: packages/trunk/supertuxkart/debian/changelog
===================================================================
--- packages/trunk/supertuxkart/debian/changelog	2015-05-18 04:57:41 UTC (rev 15427)
+++ packages/trunk/supertuxkart/debian/changelog	2015-05-18 05:07:12 UTC (rev 15428)
@@ -1,6 +1,10 @@
-supertuxkart (0.9-2) UNRELEASED; urgency=medium
+supertuxkart (0.9-2) unstable; urgency=medium
 
-  * Install upstream appdata. (Closes: #785516)
+  * Add fix_angelscript_build_on_non-x86_arches.patch to fix FTBFS on a few
+    non-x86 arches (arm*, ppc64el, s390x). Thanks to James Cowgill for the
+    patch!
+  * Install upstream appdata. Thanks to Marcus Lundblad for the patch!
+    (Closes: #785516)
   * Drop build-depends on libglew-dev; add lintian override for embedded glew.
 
  -- Vincent Cheng <vcheng at debian.org>  Sun, 17 May 2015 21:50:45 -0700

Added: packages/trunk/supertuxkart/debian/patches/fix_angelscript_build_on_non-x86_arches.patch
===================================================================
--- packages/trunk/supertuxkart/debian/patches/fix_angelscript_build_on_non-x86_arches.patch	                        (rev 0)
+++ packages/trunk/supertuxkart/debian/patches/fix_angelscript_build_on_non-x86_arches.patch	2015-05-18 05:07:12 UTC (rev 15428)
@@ -0,0 +1,44 @@
+Description: Fix FTBFS when building angelscript on non-x86 arches
+Forwarded: https://github.com/supertuxkart/stk-code/pull/2195
+Author: James Cowgill <james410 at cowgill.org.uk>
+Bug: https://github.com/supertuxkart/stk-code/issues/2194
+Last-Update: 2015-05-16
+
+--- a/lib/angelscript/projects/cmake/CMakeLists.txt
++++ b/lib/angelscript/projects/cmake/CMakeLists.txt
+@@ -45,12 +45,13 @@
+             endif()
+ endif()
+ 
+-if(ANDROID)
++if(${CMAKE_SYSTEM_PROCESSOR} MATCHES "^arm")
+         enable_language(ASM)
+         if(CMAKE_ASM_COMPILER_WORKS)
+                 set(ANGELSCRIPT_SOURCE ${ANGELSCRIPT_SOURCE} ../../source/as_callfunc_arm.cpp ../../source/as_callfunc_arm_gcc.S)
++                set_property(SOURCE ../../source/as_callfunc_arm_gcc.S APPEND PROPERTY COMPILE_FLAGS " -Wa,-mimplicit-it=always")
+         else()
+-                message(FATAL ERROR "Android target requires a working assembler")
++                message(FATAL ERROR "ARM target requires a working assembler")
+         endif(CMAKE_ASM_COMPILER_WORKS)
+ endif()
+ 
+--- a/lib/angelscript/source/as_config.h
++++ b/lib/angelscript/source/as_config.h
+@@ -555,7 +555,7 @@
+ // Use the following command to determine predefined macros: echo . | g++ -dM -E -
+ #if (defined(__GNUC__) && !defined(__SNC__)) || defined(EPPC) || defined(__CYGWIN__) // JWC -- use this instead for Wii
+ 	#define GNU_STYLE_VIRTUAL_METHOD
+-#if !defined( __amd64__ )
++#if !defined(__LP64__)
+ 	#define MULTI_BASE_OFFSET(x) (*((asDWORD*)(&x)+1))
+ #else
+ 	#define MULTI_BASE_OFFSET(x) (*((asQWORD*)(&x)+1))
+@@ -785,7 +785,7 @@
+ 			// Support native calling conventions on Intel 32bit CPU
+ 			#define THISCALL_PASS_OBJECT_POINTER_ON_THE_STACK
+ 			#define AS_X86
+-		#elif defined(__LP64__) && !defined(__arm64__)
++		#elif defined(__x86_64__)
+ 			#define AS_X64_GCC
+ 			#define HAS_128_BIT_PRIMITIVES
+ 			#define SPLIT_OBJS_BY_MEMBER_TYPES

Modified: packages/trunk/supertuxkart/debian/patches/series
===================================================================
--- packages/trunk/supertuxkart/debian/patches/series	2015-05-18 04:57:41 UTC (rev 15427)
+++ packages/trunk/supertuxkart/debian/patches/series	2015-05-18 05:07:12 UTC (rev 15428)
@@ -1,6 +1,7 @@
 build_against_system_enet.patch
 link_against_system_libs.patch
 remove_irrlicht_embedded_libs.patch
+fix_angelscript_build_on_non-x86_arches.patch
 # Irrlicht patches taken directly from irrlicht source package in Debian
 irrlicht/arch-support.diff
 irrlicht/use-system-libs.diff