Module Name: src
Committed By: mrg
Date: Fri Jul 1 01:25:52 UTC 2011
Modified Files:
src/external/mit/xorg/bin/xtrap: Makefile.xtrap
src/external/mit/xorg/lib/libGLU: Makefile
src/external/mit/xorg/lib/libXaw: Makefile
src/external/mit/xorg/lib/libXaw6: Makefile
src/external/mit/xorg/server/drivers/xf86-video-openchrome: Makefile
src/lib/libc/softfloat: Makefile.inc
Log Message:
XXX: apply -Wno-error/friends to a few files
To generate a diff of this commit:
cvs rdiff -u -r1.1.1.1 -r1.2 src/external/mit/xorg/bin/xtrap/Makefile.xtrap
cvs rdiff -u -r1.8 -r1.9 src/external/mit/xorg/lib/libGLU/Makefile
cvs rdiff -u -r1.7 -r1.8 src/external/mit/xorg/lib/libXaw/Makefile
cvs rdiff -u -r1.7 -r1.8 src/external/mit/xorg/lib/libXaw6/Makefile
cvs rdiff -u -r1.2 -r1.3 \
src/external/mit/xorg/server/drivers/xf86-video-openchrome/Makefile
cvs rdiff -u -r1.7 -r1.8 src/lib/libc/softfloat/Makefile.inc
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/bin/xtrap/Makefile.xtrap
diff -u src/external/mit/xorg/bin/xtrap/Makefile.xtrap:1.1.1.1 src/external/mit/xorg/bin/xtrap/Makefile.xtrap:1.2
--- src/external/mit/xorg/bin/xtrap/Makefile.xtrap:1.1.1.1 Tue Jul 29 05:01:22 2008
+++ src/external/mit/xorg/bin/xtrap/Makefile.xtrap Fri Jul 1 01:25:52 2011
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.xtrap,v 1.1.1.1 2008/07/29 05:01:22 mrg Exp $
+# $NetBSD: Makefile.xtrap,v 1.2 2011/07/01 01:25:52 mrg Exp $
NOMAN= 1
@@ -15,3 +15,8 @@
.include <bsd.x11.mk>
.include <bsd.prog.mk>
+
+# XXX
+.if defined(HAVE_GCC)
+COPTS+= -Wno-error
+.endif
Index: src/external/mit/xorg/lib/libGLU/Makefile
diff -u src/external/mit/xorg/lib/libGLU/Makefile:1.8 src/external/mit/xorg/lib/libGLU/Makefile:1.9
--- src/external/mit/xorg/lib/libGLU/Makefile:1.8 Mon Nov 22 21:05:29 2010
+++ src/external/mit/xorg/lib/libGLU/Makefile Fri Jul 1 01:25:52 2011
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.8 2010/11/22 21:05:29 mrg Exp $
+# $NetBSD: Makefile,v 1.9 2011/07/01 01:25:52 mrg Exp $
NOLINT= 1 # XTODO: tess.ln SIGSEGVs lint :(
@@ -89,3 +89,10 @@
.include <bsd.x11.mk>
.include <bsd.lib.mk>
+
+# XXX
+.if defined(HAVE_GCC) && ${HAVE_GCC} >= 45
+COPTS.arcsorter.cc+= -Wno-error
+COPTS.sorter.cc+= -Wno-error
+COPTS.tobezier.cc+= -Wno-error
+.endif
Index: src/external/mit/xorg/lib/libXaw/Makefile
diff -u src/external/mit/xorg/lib/libXaw/Makefile:1.7 src/external/mit/xorg/lib/libXaw/Makefile:1.8
--- src/external/mit/xorg/lib/libXaw/Makefile:1.7 Sun May 15 21:05:12 2011
+++ src/external/mit/xorg/lib/libXaw/Makefile Fri Jul 1 01:25:52 2011
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.7 2011/05/15 21:05:12 christos Exp $
+# $NetBSD: Makefile,v 1.8 2011/07/01 01:25:52 mrg Exp $
.include <bsd.own.mk>
@@ -70,3 +70,8 @@
.include <bsd.x11.mk>
.include <bsd.lib.mk>
+
+# XXX
+.if defined(HAVE_GCC)
+COPTS.XawIm.c+= -Wno-error
+.endif
Index: src/external/mit/xorg/lib/libXaw6/Makefile
diff -u src/external/mit/xorg/lib/libXaw6/Makefile:1.7 src/external/mit/xorg/lib/libXaw6/Makefile:1.8
--- src/external/mit/xorg/lib/libXaw6/Makefile:1.7 Sun May 15 21:09:30 2011
+++ src/external/mit/xorg/lib/libXaw6/Makefile Fri Jul 1 01:25:52 2011
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.7 2011/05/15 21:09:30 christos Exp $
+# $NetBSD: Makefile,v 1.8 2011/07/01 01:25:52 mrg Exp $
NOCHECKVER= yes # we want to install an older version ...
MKLINKLIB= no
@@ -36,3 +36,8 @@
.include <bsd.x11.mk>
.include <bsd.lib.mk>
+
+# XXX
+.if defined(HAVE_GCC)
+COPTS.XawIm.c+= -Wno-error
+.endif
Index: src/external/mit/xorg/server/drivers/xf86-video-openchrome/Makefile
diff -u src/external/mit/xorg/server/drivers/xf86-video-openchrome/Makefile:1.2 src/external/mit/xorg/server/drivers/xf86-video-openchrome/Makefile:1.3
--- src/external/mit/xorg/server/drivers/xf86-video-openchrome/Makefile:1.2 Tue Jun 8 04:31:43 2010
+++ src/external/mit/xorg/server/drivers/xf86-video-openchrome/Makefile Fri Jul 1 01:25:52 2011
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 2010/06/08 04:31:43 mrg Exp $
+# $NetBSD: Makefile,v 1.3 2011/07/01 01:25:52 mrg Exp $
DRIVER= xf86-video-openchrome
DRIVER_NAME= openchrome_drv
@@ -42,3 +42,8 @@
CPPFLAGS+= -DHAVE_CONFIG_H -I${X11SRCDIR.${DRIVER}}/../include
.include "../Makefile.xf86-driver"
+
+# XXX
+.if defined(HAVE_GCC)
+COPTS.via_dri.c+= -Wno-error
+.endif
Index: src/lib/libc/softfloat/Makefile.inc
diff -u src/lib/libc/softfloat/Makefile.inc:1.7 src/lib/libc/softfloat/Makefile.inc:1.8
--- src/lib/libc/softfloat/Makefile.inc:1.7 Mon Jan 17 10:08:35 2011
+++ src/lib/libc/softfloat/Makefile.inc Fri Jul 1 01:25:52 2011
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.inc,v 1.7 2011/01/17 10:08:35 matt Exp $
+# $NetBSD: Makefile.inc,v 1.8 2011/07/01 01:25:52 mrg Exp $
SOFTFLOAT_BITS?=64
.PATH: ${ARCHDIR}/softfloat \
@@ -18,3 +18,9 @@
nexf2.c gtxf2.c gexf2.c negxf2.c unordsf2.c unorddf2.c
SRCS+= ${SRCS.softfloat}
+
+# XXX
+.if defined(HAVE_GCC) && ${HAVE_GCC} >= 45 && \
+ (${MACHINE_ARCH} == "arm" || ${MACHINE_ARCH} == "armeb")
+COPTS.softfloat.c+= -Wno-enum-compare
+.endif
