Module Name: src
Committed By: joerg
Date: Thu Mar 22 23:46:28 UTC 2012
Modified Files:
src/external/mit/xorg/bin/xsetwallpaper: Makefile
src/external/mit/xorg/bin/xterm: Makefile
src/external/mit/xorg/bin/xvinfo: Makefile
src/external/mit/xorg/lib/dri/i965: Makefile
src/external/mit/xorg/lib/dri/libmesa: Makefile
src/external/mit/xorg/lib/fontconfig/src: Makefile
src/external/mit/xorg/lib/libGL: Makefile
src/external/mit/xorg/lib/libOSMesa: Makefile
src/external/mit/xorg/server/drivers/xf86-input-ws: Makefile
src/external/mit/xorg/server/drivers/xf86-video-mga: Makefile
src/external/mit/xorg/server/drivers/xf86-video-trident: Makefile
src/external/mit/xorg/server/xorg-server/dix: Makefile
Log Message:
Disable a bunch of additional warnings for now for the clang build.
To generate a diff of this commit:
cvs rdiff -u -r1.1 -r1.2 src/external/mit/xorg/bin/xsetwallpaper/Makefile
cvs rdiff -u -r1.8 -r1.9 src/external/mit/xorg/bin/xterm/Makefile
cvs rdiff -u -r1.1.1.1 -r1.2 src/external/mit/xorg/bin/xvinfo/Makefile
cvs rdiff -u -r1.13 -r1.14 src/external/mit/xorg/lib/dri/i965/Makefile
cvs rdiff -u -r1.9 -r1.10 src/external/mit/xorg/lib/dri/libmesa/Makefile
cvs rdiff -u -r1.8 -r1.9 src/external/mit/xorg/lib/fontconfig/src/Makefile
cvs rdiff -u -r1.17 -r1.18 src/external/mit/xorg/lib/libGL/Makefile
cvs rdiff -u -r1.6 -r1.7 src/external/mit/xorg/lib/libOSMesa/Makefile
cvs rdiff -u -r1.2 -r1.3 \
src/external/mit/xorg/server/drivers/xf86-input-ws/Makefile
cvs rdiff -u -r1.9 -r1.10 \
src/external/mit/xorg/server/drivers/xf86-video-mga/Makefile
cvs rdiff -u -r1.5 -r1.6 \
src/external/mit/xorg/server/drivers/xf86-video-trident/Makefile
cvs rdiff -u -r1.11 -r1.12 \
src/external/mit/xorg/server/xorg-server/dix/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/bin/xsetwallpaper/Makefile
diff -u src/external/mit/xorg/bin/xsetwallpaper/Makefile:1.1 src/external/mit/xorg/bin/xsetwallpaper/Makefile:1.2
--- src/external/mit/xorg/bin/xsetwallpaper/Makefile:1.1 Sat Oct 22 22:06:17 2011
+++ src/external/mit/xorg/bin/xsetwallpaper/Makefile Thu Mar 22 23:46:26 2012
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1 2011/10/22 22:06:17 jmcneill Exp $
+# $NetBSD: Makefile,v 1.2 2012/03/22 23:46:26 joerg Exp $
NOMAN= # defined
@@ -25,5 +25,7 @@ CPPFLAGS.stb_image.c+= -Wno-sign-compare
CPPFLAGS.stb_image.c+= -Wno-missing-prototypes
CPPFLAGS.stb_image.c+= -Wno-missing-field-initializers
+CWARNFLAGS.clang+= -Wno-missing-noreturn -Wno-self-assign
+
.include <bsd.x11.mk>
.include <bsd.prog.mk>
Index: src/external/mit/xorg/bin/xterm/Makefile
diff -u src/external/mit/xorg/bin/xterm/Makefile:1.8 src/external/mit/xorg/bin/xterm/Makefile:1.9
--- src/external/mit/xorg/bin/xterm/Makefile:1.8 Sun Oct 3 22:06:43 2010
+++ src/external/mit/xorg/bin/xterm/Makefile Thu Mar 22 23:46:26 2012
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.8 2010/10/03 22:06:43 christos Exp $
+# $NetBSD: Makefile,v 1.9 2012/03/22 23:46:26 joerg Exp $
.include <bsd.own.mk>
@@ -17,6 +17,8 @@ CPPFLAGS+= -I${X11SRCDIR.${PROG}} \
-D_REENTRANT \
${X11FLAGS.VERSION}
+CWARNFLAGS.clang+= -Wno-empty-body
+
APPDEFS=XTerm.ad XTerm-color.ad
BUILDSYMLINKS= XTerm-col.ad XTerm-color.ad
Index: src/external/mit/xorg/bin/xvinfo/Makefile
diff -u src/external/mit/xorg/bin/xvinfo/Makefile:1.1.1.1 src/external/mit/xorg/bin/xvinfo/Makefile:1.2
--- src/external/mit/xorg/bin/xvinfo/Makefile:1.1.1.1 Tue Jul 29 05:01:22 2008
+++ src/external/mit/xorg/bin/xvinfo/Makefile Thu Mar 22 23:46:27 2012
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1.1.1 2008/07/29 05:01:22 mrg Exp $
+# $NetBSD: Makefile,v 1.2 2012/03/22 23:46:27 joerg Exp $
.include <bsd.own.mk>
@@ -9,5 +9,7 @@ DPADD+= ${LIBXV} ${LIBXEXT} ${LIBX11}
.PATH: ${X11SRCDIR.${PROG}}
+CWARNFLAGS.clang+= -Wno-dangling-else
+
.include <bsd.x11.mk>
.include <bsd.prog.mk>
Index: src/external/mit/xorg/lib/dri/i965/Makefile
diff -u src/external/mit/xorg/lib/dri/i965/Makefile:1.13 src/external/mit/xorg/lib/dri/i965/Makefile:1.14
--- src/external/mit/xorg/lib/dri/i965/Makefile:1.13 Thu Aug 11 23:15:36 2011
+++ src/external/mit/xorg/lib/dri/i965/Makefile Thu Mar 22 23:46:27 2012
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.13 2011/08/11 23:15:36 joerg Exp $
+# $NetBSD: Makefile,v 1.14 2012/03/22 23:46:27 joerg Exp $
MODULE= i965
@@ -102,7 +102,7 @@ SRCS= \
gen6_wm_state.c
COPTS.brw_draw_upload.c= -Wno-error
-CWARNFLAGS.clang+= -Wno-format
+CWARNFLAGS.clang+= -Wno-format -Wno-switch
LIBDPLIBS+= drm_intel ${.CURDIR}/../../libdrm_intel
Index: src/external/mit/xorg/lib/dri/libmesa/Makefile
diff -u src/external/mit/xorg/lib/dri/libmesa/Makefile:1.9 src/external/mit/xorg/lib/dri/libmesa/Makefile:1.10
--- src/external/mit/xorg/lib/dri/libmesa/Makefile:1.9 Thu Aug 11 23:15:36 2011
+++ src/external/mit/xorg/lib/dri/libmesa/Makefile Thu Mar 22 23:46:27 2012
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.9 2011/08/11 23:15:36 joerg Exp $
+# $NetBSD: Makefile,v 1.10 2012/03/22 23:46:27 joerg Exp $
.include <bsd.own.mk>
@@ -35,6 +35,6 @@ LIBDIR= ${X11USRLIBDIR}/modules/dri
#LIBDPLIBS+= GL ${.CURDIR}/../../libGL
-CWARNFLAGS.clang+= -Wno-format
+CWARNFLAGS.clang+= -Wno-format -Wno-constant-conversion
.include <bsd.lib.mk>
Index: src/external/mit/xorg/lib/fontconfig/src/Makefile
diff -u src/external/mit/xorg/lib/fontconfig/src/Makefile:1.8 src/external/mit/xorg/lib/fontconfig/src/Makefile:1.9
--- src/external/mit/xorg/lib/fontconfig/src/Makefile:1.8 Wed Feb 29 20:07:57 2012
+++ src/external/mit/xorg/lib/fontconfig/src/Makefile Thu Mar 22 23:46:27 2012
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.8 2012/02/29 20:07:57 tron Exp $
+# $NetBSD: Makefile,v 1.9 2012/03/22 23:46:27 joerg Exp $
.include <bsd.own.mk>
@@ -119,7 +119,7 @@ PKGCONFIG_VERSION.fontconfig= 2.6.0
# XXX
CPPFLAGS.fcxml.c= -Wno-error
-CWARNFLAGS.clang+= -Wno-pointer-sign
+CWARNFLAGS.clang+= -Wno-pointer-sign -Wno-switch
.include <bsd.x11.mk>
.include <bsd.lib.mk>
Index: src/external/mit/xorg/lib/libGL/Makefile
diff -u src/external/mit/xorg/lib/libGL/Makefile:1.17 src/external/mit/xorg/lib/libGL/Makefile:1.18
--- src/external/mit/xorg/lib/libGL/Makefile:1.17 Thu Aug 11 23:15:38 2011
+++ src/external/mit/xorg/lib/libGL/Makefile Thu Mar 22 23:46:27 2012
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.17 2011/08/11 23:15:38 joerg Exp $
+# $NetBSD: Makefile,v 1.18 2012/03/22 23:46:27 joerg Exp $
.include <bsd.own.mk>
@@ -109,7 +109,7 @@ PKGDIST.gl= ${X11SRCDIR.MesaLib}/src/mes
.include "${.CURDIR}/../libGL/mesa-ver.mk"
PKGCONFIG_VERSION.gl= ${MESA_VER}
-CWARNFLAGS.clang+= -Wno-tautological-compare -Wno-format
+CWARNFLAGS.clang+= -Wno-tautological-compare -Wno-format -Wno-constant-conversion
.include <bsd.x11.mk>
.include <bsd.lib.mk>
Index: src/external/mit/xorg/lib/libOSMesa/Makefile
diff -u src/external/mit/xorg/lib/libOSMesa/Makefile:1.6 src/external/mit/xorg/lib/libOSMesa/Makefile:1.7
--- src/external/mit/xorg/lib/libOSMesa/Makefile:1.6 Thu Aug 11 23:15:38 2011
+++ src/external/mit/xorg/lib/libOSMesa/Makefile Thu Mar 22 23:46:27 2012
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.6 2011/08/11 23:15:38 joerg Exp $
+# $NetBSD: Makefile,v 1.7 2012/03/22 23:46:27 joerg Exp $
.include <bsd.own.mk>
@@ -16,7 +16,7 @@ CPPFLAGS+= ${X11FLAGS.THREADLIB} \
-D_NETBSD_SOURCE -DUSE_EXTERNAL_DXTN_LIB=1 -DHAVE_ALIAS
CFLAGS+= -pthread
-CWARNFLAGS.clang+= -Wno-format
+CWARNFLAGS.clang+= -Wno-format -Wno-constant-conversion
.include "libmesa.mk"
Index: src/external/mit/xorg/server/drivers/xf86-input-ws/Makefile
diff -u src/external/mit/xorg/server/drivers/xf86-input-ws/Makefile:1.2 src/external/mit/xorg/server/drivers/xf86-input-ws/Makefile:1.3
--- src/external/mit/xorg/server/drivers/xf86-input-ws/Makefile:1.2 Mon Sep 26 18:08:09 2011
+++ src/external/mit/xorg/server/drivers/xf86-input-ws/Makefile Thu Mar 22 23:46:27 2012
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 2011/09/26 18:08:09 tsutsui Exp $
+# $NetBSD: Makefile,v 1.3 2012/03/22 23:46:27 joerg Exp $
WARNS?= 2
@@ -12,4 +12,6 @@ CPPFLAGS+= -DHAVE_CONFIG_H \
-I${X11SRCDIR.${DRIVER}}/../include \
-I${X11SRCDIR.${DRIVER}}/include
+CWARNFLAGS.clang+= -Wno-parentheses-equality
+
.include "../Makefile.xf86-driver"
Index: src/external/mit/xorg/server/drivers/xf86-video-mga/Makefile
diff -u src/external/mit/xorg/server/drivers/xf86-video-mga/Makefile:1.9 src/external/mit/xorg/server/drivers/xf86-video-mga/Makefile:1.10
--- src/external/mit/xorg/server/drivers/xf86-video-mga/Makefile:1.9 Thu Aug 11 23:15:40 2011
+++ src/external/mit/xorg/server/drivers/xf86-video-mga/Makefile Thu Mar 22 23:46:27 2012
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.9 2011/08/11 23:15:40 joerg Exp $
+# $NetBSD: Makefile,v 1.10 2012/03/22 23:46:27 joerg Exp $
.include <bsd.own.mk>
@@ -32,6 +32,6 @@ CPPFLAGS+= -I${DESTDIR}${X11INCDIR}/libd
CPPFLAGS.mga_driver.c= -Wno-error # XXX fix me please
CPPFLAGS.mga_dacG.c= -Wno-error # XXX fix me please
-CWARNFLAGS.clang+= -Wno-conversion -Wno-format
+CWARNFLAGS.clang+= -Wno-conversion -Wno-format -Wno-empty-body
.include "../Makefile.xf86-driver"
Index: src/external/mit/xorg/server/drivers/xf86-video-trident/Makefile
diff -u src/external/mit/xorg/server/drivers/xf86-video-trident/Makefile:1.5 src/external/mit/xorg/server/drivers/xf86-video-trident/Makefile:1.6
--- src/external/mit/xorg/server/drivers/xf86-video-trident/Makefile:1.5 Thu Aug 11 23:15:41 2011
+++ src/external/mit/xorg/server/drivers/xf86-video-trident/Makefile Thu Mar 22 23:46:27 2012
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.5 2011/08/11 23:15:41 joerg Exp $
+# $NetBSD: Makefile,v 1.6 2012/03/22 23:46:27 joerg Exp $
DRIVER= xf86-video-trident
DRIVER_NAME= trident_drv
@@ -13,6 +13,6 @@ MAN= trident.4
COPTS.trident_driver.c= -Wno-error # XXX xf86dgastr.h
-CWARNFLAGS.clang+= -Wno-return-type
+CWARNFLAGS.clang+= -Wno-return-type -Wno-empty-body
.include "../Makefile.xf86-driver"
Index: src/external/mit/xorg/server/xorg-server/dix/Makefile
diff -u src/external/mit/xorg/server/xorg-server/dix/Makefile:1.11 src/external/mit/xorg/server/xorg-server/dix/Makefile:1.12
--- src/external/mit/xorg/server/xorg-server/dix/Makefile:1.11 Thu Aug 11 23:15:41 2011
+++ src/external/mit/xorg/server/xorg-server/dix/Makefile Thu Mar 22 23:46:28 2012
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.11 2011/08/11 23:15:41 joerg Exp $
+# $NetBSD: Makefile,v 1.12 2012/03/22 23:46:28 joerg Exp $
.include "../Makefile.serverlib"
.include "../Makefile.servermod"
@@ -44,7 +44,7 @@ COPTS.resource.c= -Wno-error
COPTS.window.c= -Wno-error
COPTS.inpututils.c= -Wno-error
-CWARNFLAGS.clang+= -Wno-switch-enum
+CWARNFLAGS.clang+= -Wno-switch
.include <bsd.x11.mk>
.include <bsd.lib.mk>
