[src/trunk]: src/external/mit/xorg Disable a bunch of additional warnings for...

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

details:   https://anonhg.NetBSD.org/src/rev/f0a1d0b87c60
branches:  trunk
changeset: 778352:f0a1d0b87c60
user:      joerg <joerg%NetBSD.org@localhost>
date:      Thu Mar 22 23:46:26 2012 +0000

description:
Disable a bunch of additional warnings for now for the clang build.

diffstat:

 external/mit/xorg/bin/xsetwallpaper/Makefile                 |  4 +++-
 external/mit/xorg/bin/xterm/Makefile                         |  4 +++-
 external/mit/xorg/bin/xvinfo/Makefile                        |  4 +++-
 external/mit/xorg/lib/dri/i965/Makefile                      |  4 ++--
 external/mit/xorg/lib/dri/libmesa/Makefile                   |  4 ++--
 external/mit/xorg/lib/fontconfig/src/Makefile                |  4 ++--
 external/mit/xorg/lib/libGL/Makefile                         |  4 ++--
 external/mit/xorg/lib/libOSMesa/Makefile                     |  4 ++--
 external/mit/xorg/server/drivers/xf86-input-ws/Makefile      |  4 +++-
 external/mit/xorg/server/drivers/xf86-video-mga/Makefile     |  4 ++--
 external/mit/xorg/server/drivers/xf86-video-trident/Makefile |  4 ++--
 external/mit/xorg/server/xorg-server/dix/Makefile            |  4 ++--
 12 files changed, 28 insertions(+), 20 deletions(-)

diffs (209 lines):

diff -r 38ea2cfabcd5 -r f0a1d0b87c60 external/mit/xorg/bin/xsetwallpaper/Makefile
--- a/external/mit/xorg/bin/xsetwallpaper/Makefile      Thu Mar 22 22:59:43 2012 +0000
+++ b/external/mit/xorg/bin/xsetwallpaper/Makefile      Thu Mar 22 23:46:26 2012 +0000
@@ -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-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>
diff -r 38ea2cfabcd5 -r f0a1d0b87c60 external/mit/xorg/bin/xterm/Makefile
--- a/external/mit/xorg/bin/xterm/Makefile      Thu Mar 22 22:59:43 2012 +0000
+++ b/external/mit/xorg/bin/xterm/Makefile      Thu Mar 22 23:46:26 2012 +0000
@@ -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 @@
                -D_REENTRANT \
                ${X11FLAGS.VERSION}
 
+CWARNFLAGS.clang+=     -Wno-empty-body
+
 APPDEFS=XTerm.ad XTerm-color.ad
 
 BUILDSYMLINKS= XTerm-col.ad XTerm-color.ad
diff -r 38ea2cfabcd5 -r f0a1d0b87c60 external/mit/xorg/bin/xvinfo/Makefile
--- a/external/mit/xorg/bin/xvinfo/Makefile     Thu Mar 22 22:59:43 2012 +0000
+++ b/external/mit/xorg/bin/xvinfo/Makefile     Thu Mar 22 23:46:26 2012 +0000
@@ -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 @@
 
 .PATH: ${X11SRCDIR.${PROG}}
 
+CWARNFLAGS.clang+=     -Wno-dangling-else
+
 .include <bsd.x11.mk>
 .include <bsd.prog.mk>
diff -r 38ea2cfabcd5 -r f0a1d0b87c60 external/mit/xorg/lib/dri/i965/Makefile
--- a/external/mit/xorg/lib/dri/i965/Makefile   Thu Mar 22 22:59:43 2012 +0000
+++ b/external/mit/xorg/lib/dri/i965/Makefile   Thu Mar 22 23:46:26 2012 +0000
@@ -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 @@
        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
 
diff -r 38ea2cfabcd5 -r f0a1d0b87c60 external/mit/xorg/lib/dri/libmesa/Makefile
--- a/external/mit/xorg/lib/dri/libmesa/Makefile        Thu Mar 22 22:59:43 2012 +0000
+++ b/external/mit/xorg/lib/dri/libmesa/Makefile        Thu Mar 22 23:46:26 2012 +0000
@@ -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 @@
 
 #LIBDPLIBS+=   GL      ${.CURDIR}/../../libGL
 
-CWARNFLAGS.clang+=     -Wno-format
+CWARNFLAGS.clang+=     -Wno-format -Wno-constant-conversion
 
 .include <bsd.lib.mk>
diff -r 38ea2cfabcd5 -r f0a1d0b87c60 external/mit/xorg/lib/fontconfig/src/Makefile
--- a/external/mit/xorg/lib/fontconfig/src/Makefile     Thu Mar 22 22:59:43 2012 +0000
+++ b/external/mit/xorg/lib/fontconfig/src/Makefile     Thu Mar 22 23:46:26 2012 +0000
@@ -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 @@
 # 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>
diff -r 38ea2cfabcd5 -r f0a1d0b87c60 external/mit/xorg/lib/libGL/Makefile
--- a/external/mit/xorg/lib/libGL/Makefile      Thu Mar 22 22:59:43 2012 +0000
+++ b/external/mit/xorg/lib/libGL/Makefile      Thu Mar 22 23:46:26 2012 +0000
@@ -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 @@
 .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>
diff -r 38ea2cfabcd5 -r f0a1d0b87c60 external/mit/xorg/lib/libOSMesa/Makefile
--- a/external/mit/xorg/lib/libOSMesa/Makefile  Thu Mar 22 22:59:43 2012 +0000
+++ b/external/mit/xorg/lib/libOSMesa/Makefile  Thu Mar 22 23:46:26 2012 +0000
@@ -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 @@
                -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"
 
diff -r 38ea2cfabcd5 -r f0a1d0b87c60 external/mit/xorg/server/drivers/xf86-input-ws/Makefile
--- a/external/mit/xorg/server/drivers/xf86-input-ws/Makefile   Thu Mar 22 22:59:43 2012 +0000
+++ b/external/mit/xorg/server/drivers/xf86-input-ws/Makefile   Thu Mar 22 23:46:26 2012 +0000
@@ -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 @@
                -I${X11SRCDIR.${DRIVER}}/../include \
                -I${X11SRCDIR.${DRIVER}}/include
 
+CWARNFLAGS.clang+=     -Wno-parentheses-equality
+
 .include "../Makefile.xf86-driver"
diff -r 38ea2cfabcd5 -r f0a1d0b87c60 external/mit/xorg/server/drivers/xf86-video-mga/Makefile
--- a/external/mit/xorg/server/drivers/xf86-video-mga/Makefile  Thu Mar 22 22:59:43 2012 +0000
+++ b/external/mit/xorg/server/drivers/xf86-video-mga/Makefile  Thu Mar 22 23:46:26 2012 +0000
@@ -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.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"
diff -r 38ea2cfabcd5 -r f0a1d0b87c60 external/mit/xorg/server/drivers/xf86-video-trident/Makefile
--- a/external/mit/xorg/server/drivers/xf86-video-trident/Makefile      Thu Mar 22 22:59:43 2012 +0000
+++ b/external/mit/xorg/server/drivers/xf86-video-trident/Makefile      Thu Mar 22 23:46:26 2012 +0000
@@ -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 @@
 
 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"
diff -r 38ea2cfabcd5 -r f0a1d0b87c60 external/mit/xorg/server/xorg-server/dix/Makefile
--- a/external/mit/xorg/server/xorg-server/dix/Makefile Thu Mar 22 22:59:43 2012 +0000
+++ b/external/mit/xorg/server/xorg-server/dix/Makefile Thu Mar 22 23:46:26 2012 +0000
@@ -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.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>