Author: vcheng Date: 2015-06-04 03:27:59 +0000 (Thu, 04 Jun 2015) New Revision: 15449
Modified: packages/trunk/supertuxkart/debian/changelog packages/trunk/supertuxkart/debian/patches/fix_angelscript_build_on_non-x86_arches.patch Log: update armel FTBFS patch...again, urgh Modified: packages/trunk/supertuxkart/debian/changelog =================================================================== --- packages/trunk/supertuxkart/debian/changelog 2015-06-02 07:54:38 UTC (rev 15448) +++ packages/trunk/supertuxkart/debian/changelog 2015-06-04 03:27:59 UTC (rev 15449) @@ -1,3 +1,10 @@ +supertuxkart (0.9-4) unstable; urgency=medium + + * Update fix_angelscript_build_on_non-x86_arches.patch again to fix FTBFS + on armel. + + -- Vincent Cheng <[email protected]> Wed, 03 Jun 2015 20:26:12 -0700 + supertuxkart (0.9-3) unstable; urgency=medium * Update fix_angelscript_build_on_non-x86_arches.patch to fix FTBFS on Modified: 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 2015-06-02 07:54:38 UTC (rev 15448) +++ packages/trunk/supertuxkart/debian/patches/fix_angelscript_build_on_non-x86_arches.patch 2015-06-04 03:27:59 UTC (rev 15449) @@ -2,7 +2,7 @@ Forwarded: https://github.com/supertuxkart/stk-code/pull/2195 Author: James Cowgill <[email protected]> Bug: https://github.com/supertuxkart/stk-code/issues/2194 -Last-Update: 2015-06-01 +Last-Update: 2015-06-03 --- a/lib/angelscript/projects/cmake/CMakeLists.txt +++ b/lib/angelscript/projects/cmake/CMakeLists.txt @@ -51,3 +51,70 @@ #define AS_ARM #undef STDCALL +--- a/lib/angelscript/source/as_callfunc_arm_gcc.S ++++ b/lib/angelscript/source/as_callfunc_arm_gcc.S +@@ -85,7 +85,12 @@ + bne stackargsloop + mov sp, r12 + nomoreargs: ++#if defined (___ARM_ARCH_4T__) || defined (__ARM_ARCH_4__) ++ mov lr, pc /* older ARM didn't support blx */ ++ mov pc, r4 ++#else + blx r4 ++#endif + add sp, sp, r8 + ldmia sp!, {r4-r8, pc} + +@@ -133,7 +138,12 @@ + bne stackargslooparmFuncObjLast + mov sp, r12 + nomoreargsarmFuncObjLast: ++#if defined (___ARM_ARCH_4T__) || defined (__ARM_ARCH_4__) ++ mov lr, pc /* older ARM didn't support blx */ ++ mov pc, r4 ++#else + blx r4 ++#endif + add sp, sp, r8 + ldmia sp!, {r4-r8, pc} + +@@ -180,7 +190,12 @@ + bne stackargslooparmFuncR0ObjLast + mov sp, r12 + nomoreargsarmFuncR0ObjLast: ++#if defined (___ARM_ARCH_4T__) || defined (__ARM_ARCH_4__) ++ mov lr, pc /* older ARM didn't support blx */ ++ mov pc, r4 ++#else + blx r4 ++#endif + add sp, sp, r8 + ldmia sp!, {r4-r8, pc} + +@@ -218,7 +233,12 @@ + bne stackargslooparmFuncR0 + mov sp, r12 + nomoreargsarmFuncR0: ++#if defined (___ARM_ARCH_4T__) || defined (__ARM_ARCH_4__) ++ mov lr, pc /* older ARM didn't support blx */ ++ mov pc, r4 ++#else + blx r4 ++#endif + add sp, sp, r8 + ldmia sp!, {r4-r8, pc} + +@@ -255,7 +275,12 @@ + bne stackargslooparmFuncR0R1 + mov sp, r12 + nomoreargsarmFuncR0R1: ++#if defined (___ARM_ARCH_4T__) || defined (__ARM_ARCH_4__) ++ mov lr, pc /* older ARM didn't support blx */ ++ mov pc, r4 ++#else + blx r4 ++#endif + add sp, sp, r8 + ldmia sp!, {r4-r8, pc} + _______________________________________________ Pkg-games-commits mailing list [email protected] http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-games-commits
