r15867 - in packages/trunk/0ad/debian: . patches

[Vincent Cheng]

Author: vcheng
Date: 2016-09-08 06:01:31 +0000 (Thu, 08 Sep 2016)
New Revision: 15867

Added:
   packages/trunk/0ad/debian/patches/fix-gcc6-segfault.patch
Modified:
   packages/trunk/0ad/debian/changelog
   packages/trunk/0ad/debian/patches/series
Log:
0ad: add patch to fix segfault when built with gcc 6


Modified: packages/trunk/0ad/debian/changelog
===================================================================
--- packages/trunk/0ad/debian/changelog	2016-09-08 01:38:32 UTC (rev 15866)
+++ packages/trunk/0ad/debian/changelog	2016-09-08 06:01:31 UTC (rev 15867)
@@ -1,9 +1,11 @@
 0ad (0.0.20-3) UNRELEASED; urgency=medium
 
+  * Add debian/patches/fix-gcc6-segfault.patch to fix spidermonkey segfault
+    when built with gcc6.
   * Call dh_strip --dbgsym-migration to cleanly migrate from the old -dbg
     package to -dbgsym.
 
- -- Vincent Cheng <vcheng at debian.org>  Sat, 20 Aug 2016 22:52:39 -0700
+ -- Vincent Cheng <vcheng at debian.org>  Wed, 07 Sep 2016 22:44:22 -0700
 
 0ad (0.0.20-2) unstable; urgency=medium
 

Added: packages/trunk/0ad/debian/patches/fix-gcc6-segfault.patch
===================================================================
--- packages/trunk/0ad/debian/patches/fix-gcc6-segfault.patch	                        (rev 0)
+++ packages/trunk/0ad/debian/patches/fix-gcc6-segfault.patch	2016-09-08 06:01:31 UTC (rev 15867)
@@ -0,0 +1,32 @@
+Description: Fix segfault due to spidermonkey GC bug when built with gcc 6
+Bug: http://trac.wildfiregames.com/ticket/4053 (based off of  tmpfixgcsegfault3.patch)
+Last-Update: 2016-09-07
+
+--- a/libraries/source/spidermonkey/FixGCSegfault.diff
++++ b/libraries/source/spidermonkey/FixGCSegfault.diff
+@@ -0,0 +1,16 @@
++diff --git a/js/src/configure b/js/src/configure
++--- a/js/src/configure
+++++ b/js/src/configure
++@@ -8776,11 +8776,11 @@ if test "$GNU_CC"; then
++     if test -z "$DEVELOPER_OPTIONS"; then
++         CFLAGS="$CFLAGS -ffunction-sections -fdata-sections"
++         CXXFLAGS="$CXXFLAGS -ffunction-sections -fdata-sections"
++     fi
++     CFLAGS="$CFLAGS -fno-math-errno"
++-    CXXFLAGS="$CXXFLAGS -fno-exceptions -fno-math-errno"
+++    CXXFLAGS="$CXXFLAGS -fno-exceptions -fno-math-errno -fno-delete-null-pointer-checks"
++ fi
++ 
++ 
++ # Check whether --enable-icf or --disable-icf was given.
++ if test "${enable_icf+set}" = set; then
+--- a/libraries/source/spidermonkey/patch.sh
++++ b/libraries/source/spidermonkey/patch.sh
+@@ -23,3 +23,6 @@
+ 
+ # Fix debug build failure on platforms with Ion disabled (eg AArch64)
+ patch -p1 -i ../FixBug1037470.diff
++
++# Temporary fix for segfault occurring in the GC when built with GCC 6
++patch -p1 -i ../FixGCSegfault.diff

Modified: packages/trunk/0ad/debian/patches/series
===================================================================
--- packages/trunk/0ad/debian/patches/series	2016-09-08 01:38:32 UTC (rev 15866)
+++ packages/trunk/0ad/debian/patches/series	2016-09-08 06:01:31 UTC (rev 15867)
@@ -1,3 +1,4 @@
 enable-hardening-relro.patch
 allow-build-with-root.patch
 fix-bindir.patch
+fix-gcc6-segfault.patch