Author: vincentc-guest Date: 2013-09-17 10:10:27 +0000 (Tue, 17 Sep 2013) New Revision: 14577
Added: packages/trunk/0ad/debian/patches/fix-arm-ftbfs.patch Modified: packages/trunk/0ad/debian/changelog packages/trunk/0ad/debian/patches/series Log: 0ad: Add proposed upstream patch to fix FTBFS on armel and armhf Modified: packages/trunk/0ad/debian/changelog =================================================================== --- packages/trunk/0ad/debian/changelog 2013-09-15 15:33:25 UTC (rev 14576) +++ packages/trunk/0ad/debian/changelog 2013-09-17 10:10:27 UTC (rev 14577) @@ -1,3 +1,9 @@ +0ad (0.0.14-3) unstable; urgency=low + + * Add debian/patches/fix-arm-ftbfs.patch to fix FTBFS on armel and armhf. + + -- Vincent Cheng <[email protected]> Tue, 17 Sep 2013 01:08:10 -0700 + 0ad (0.0.14-2) unstable; urgency=low * Tighten build dependency on libnvtt-dev to >= 2.0.8-1+dfsg-4 to ensure Added: packages/trunk/0ad/debian/patches/fix-arm-ftbfs.patch =================================================================== --- packages/trunk/0ad/debian/patches/fix-arm-ftbfs.patch (rev 0) +++ packages/trunk/0ad/debian/patches/fix-arm-ftbfs.patch 2013-09-17 10:10:27 UTC (rev 14577) @@ -0,0 +1,88 @@ +Description: Fix FTBFS on armel and armhf +Origin: upstream +Bug: http://trac.wildfiregames.com/ticket/2121 +Last-Update: 2013-09-17 + +--- a/build/premake/premake4.lua ++++ b/build/premake/premake4.lua +@@ -268,14 +268,12 @@ + end + + if arch == "arm" then +- -- disable warnings about va_list ABI change +- buildoptions { "-Wno-psabi" } ++ -- disable warnings about va_list ABI change and ++ -- target generic armv7 CPUs but use system default FPU/ABI ++ buildoptions { "-Wno-psabi -mtune=generic-armv7-a" } + if _OPTIONS["android"] then +- -- target generic arm CPUs with NEON +- buildoptions { "-mtune=generic-arm -mfpu=neon -mfloat-abi=softfp" } +- else +- -- target Cortex-A15 CPUs with NEON +- buildoptions { "-mtune=cortex-a15 -mfpu=neon-vfpv4 -mfloat-abi=hard" } ++ -- Android uses softfp, so we should too. ++ buildoptions { "-mfloat-abi=softfp" } + end + end + +--- a/libraries/source/fcollada/src/FCollada/FUtils/FUAssert.cpp ++++ b/libraries/source/fcollada/src/FCollada/FUtils/FUAssert.cpp +@@ -8,6 +8,7 @@ + + #include "StdAfx.h" + #include "FUAssert.h" ++#include "sys/signal.h" + #ifdef __APPLE__ + #include <CoreServices/CoreServices.h> + #endif +@@ -41,14 +42,15 @@ + { + return true; + } +-#elif defined (__APPLE__) +- Debugger(); +- //SysBreak(); +-#elif defined (__arm__) +- __asm__("bkpt 0"); +-#else +- // AFAIK This is available on all X86 platforms +- __asm__("int $0x03"); ++#elif defined(__APPLE__) ++ Debugger(); ++ //SysBreak(); ++#elif defined(__arm__) ++ __asm__("bkpt 0"); ++#elif defined(__i386__) ++ __asm__("int $0x03"); ++#else ++ throw(SIGTRAP); + #endif // WIN32 + return false; + } +--- a/libraries/source/fcollada/src/Makefile ++++ b/libraries/source/fcollada/src/Makefile +@@ -1,18 +1,17 @@ + OS_ARCH := $(shell uname -s) +-OS_CPU := $(shell uname -p) + + ifeq ($(OS_ARCH),Darwin) +-PIC_FLAGS ?= -fPIC ++ PIC_FLAGS ?= -fPIC + else +-OS_DEFINE ?= -DLINUX +-PIC_FLAGS ?= -fpic ++ OS_DEFINE ?= -DLINUX ++ PIC_FLAGS ?= -fpic + endif + + CXX ?= g++ + CXXFLAGS += -fvisibility=hidden -W -Wall -Wno-unused-parameter -Wno-unused-function -Wno-unused-but-set-variable $(OS_DEFINE) $(PIC_FLAGS) $(CPPFLAGS) +-# If we're compiling on *nix ARM, target Cortex-A15 CPUs with NEON ***mfloat-abi setting must be the same on everything linked to FCollada*** +-ifeq ($(OS_CPU),armv7l) +-CXXFLAGS += -mtune=cortex-a15 -mfpu=neon-vfpv4 -mfloat-abi=hard ++# If we're compiling on *nix ARM, target generic armv7 CPUs but use default FPU/ABI ++ifeq ($(shell uname -p | grep -q "arm"; $?),0) ++ CXXFLAGS += -mtune=generic-armv7-a + endif + CXXFLAGS_DEBUG := -O0 -g -D_DEBUG -DRETAIL + CXXFLAGS_RELEASE := -O1 -DNDEBUG -DRETAIL Modified: packages/trunk/0ad/debian/patches/series =================================================================== --- packages/trunk/0ad/debian/patches/series 2013-09-15 15:33:25 UTC (rev 14576) +++ packages/trunk/0ad/debian/patches/series 2013-09-17 10:10:27 UTC (rev 14577) @@ -1 +1,2 @@ enable-hardening-relro.patch +fix-arm-ftbfs.patch _______________________________________________ Pkg-games-commits mailing list [email protected] http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-games-commits
