[src/netbsd-7]: src/external/mit/xorg/lib/libXft Pull up following revision(s...

[snj <snj%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/45e21ca9f21d
branches:  netbsd-7
changeset: 798608:45e21ca9f21d
user:      snj <snj%NetBSD.org@localhost>
date:      Thu Nov 20 10:08:17 2014 +0000

description:
Pull up following revision(s) (requested by jmcneill in ticket #253):
        external/mit/xorg/lib/libXft/Makefile: revision 1.6
compile xftrender.c with -O0 to workaround a crash in XftGlyphSpecRender
on earm with gcc 4.8.4

diffstat:

 external/mit/xorg/lib/libXft/Makefile |  7 ++++++-
 1 files changed, 6 insertions(+), 1 deletions(-)

diffs (21 lines):

diff -r cb004aa4cf1d -r 45e21ca9f21d external/mit/xorg/lib/libXft/Makefile
--- a/external/mit/xorg/lib/libXft/Makefile     Thu Nov 20 10:05:06 2014 +0000
+++ b/external/mit/xorg/lib/libXft/Makefile     Thu Nov 20 10:08:17 2014 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: Makefile,v 1.5 2008/11/06 22:28:26 veego Exp $
+#      $NetBSD: Makefile,v 1.5.26.1 2014/11/20 10:08:17 snj Exp $
 
 .include <bsd.own.mk>
 
@@ -20,6 +20,11 @@
 CPPFLAGS+=     -DFREETYPE2 -I${DESTDIR}${X11INCDIR}/freetype2 -DXFREE86_FT2
 CPPFLAGS+=     -I${DESTDIR}${X11INCDIR}/X11/Xft
 
+.if !empty(MACHINE_ARCH:Mearm*)
+# Workaround a crash in XftGlyphSpecRender with GCC 4.8.4
+COPTS.xftrender.c+= -O0
+.endif
+
 LIBDPLIBS=     X11             ${.CURDIR}/../libX11/dynamic \
                fontconfig      ${.CURDIR}/../fontconfig/src \
                freetype        ${.CURDIR}/../freetype \