Module Name: src
Committed By: snj
Date: Thu Nov 20 10:08:17 UTC 2014
Modified Files:
src/external/mit/xorg/lib/libXft [netbsd-7]: Makefile
Log Message:
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
To generate a diff of this commit:
cvs rdiff -u -r1.5 -r1.5.26.1 src/external/mit/xorg/lib/libXft/Makefile
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/external/mit/xorg/lib/libXft/Makefile
diff -u src/external/mit/xorg/lib/libXft/Makefile:1.5 src/external/mit/xorg/lib/libXft/Makefile:1.5.26.1
--- src/external/mit/xorg/lib/libXft/Makefile:1.5 Thu Nov 6 22:28:26 2008
+++ src/external/mit/xorg/lib/libXft/Makefile Thu Nov 20 10:08:17 2014
@@ -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+= ${X11FLAGS.THREADLIB}
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 \
