svn commit: r367209 - in head/x11-fonts/fontconfig: . files

[Sean Bruno]

Author: sbruno (src committer)
Date: Wed Sep  3 14:57:53 2014
New Revision: 367209
URL: http://svnweb.freebsd.org/changeset/ports/367209
QAT: https://qat.redports.org/buildarchive/r367209/

Log:
  Undiagnosed ARMv6 core dump occurs when using GCC with fontconfig.
  
  Avoid this crash and resore compiles via CLANG.
  
  PR:		183536
  Submitted by:	mazhe at alkumuna.eu
  Reviewed by:	kwm

Added:
  head/x11-fonts/fontconfig/files/patch-src__fccompat.c   (contents, props changed)
Modified:
  head/x11-fonts/fontconfig/Makefile

Modified: head/x11-fonts/fontconfig/Makefile
==============================================================================
--- head/x11-fonts/fontconfig/Makefile	Wed Sep  3 14:55:01 2014	(r367208)
+++ head/x11-fonts/fontconfig/Makefile	Wed Sep  3 14:57:53 2014	(r367209)
@@ -43,11 +43,6 @@ OPTIONS_DEFINE=	DOCS
 
 .include <bsd.port.options.mk>
 
-# work around fc-cache crash on arm platform
-.if ${ARCH} == arm || ${ARCH} == armv6
-USE_GCC=	any
-.endif
-
 post-install:
 .if ${PORT_OPTIONS:MDOCS}
 	${MKDIR} ${STAGEDIR}${DOCSDIR}

Added: head/x11-fonts/fontconfig/files/patch-src__fccompat.c
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/x11-fonts/fontconfig/files/patch-src__fccompat.c	Wed Sep  3 14:57:53 2014	(r367209)
@@ -0,0 +1,15 @@
+There is an undiagnosed ARMv6 core dump in this code
+as discovered in FreeBSD Bug 183536 when using clang.
+Removing this code from ARM builds resolves it.
+
+--- src/fccompat.c.orig	2013-10-11 03:10:18 UTC
++++ src/fccompat.c
+@@ -178,7 +178,7 @@
+     }
+ 
+     random_r(&fcrandbuf, &result);
+-#elif HAVE_RANDOM
++#elif HAVE_RANDOM && !defined(__arm__)
+     static char statebuf[256];
+     char *state;
+     static FcBool initialized = FcFalse;