Module Name: src Committed By: joerg Date: Thu Aug 11 23:15:41 UTC 2011
Modified Files: src/external/mit/xorg/bin/bitmap: Makefile src/external/mit/xorg/bin/editres: Makefile src/external/mit/xorg/bin/fonttosfnt: Makefile src/external/mit/xorg/bin/twm: Makefile src/external/mit/xorg/bin/xedit/lisp: Makefile src/external/mit/xorg/bin/xkbcomp: Makefile src/external/mit/xorg/bin/xmh: Makefile src/external/mit/xorg/bin/xrandr: Makefile src/external/mit/xorg/bin/xwininfo: Makefile src/external/mit/xorg/lib/dri/i810: Makefile src/external/mit/xorg/lib/dri/i915: Makefile src/external/mit/xorg/lib/dri/i965: Makefile src/external/mit/xorg/lib/dri/libmesa: Makefile src/external/mit/xorg/lib/dri/mach64: Makefile src/external/mit/xorg/lib/dri/mga: Makefile src/external/mit/xorg/lib/dri/r128: Makefile src/external/mit/xorg/lib/dri/r200: Makefile src/external/mit/xorg/lib/dri/r300: Makefile src/external/mit/xorg/lib/dri/r600: Makefile src/external/mit/xorg/lib/dri/radeon: Makefile src/external/mit/xorg/lib/dri/savage: Makefile src/external/mit/xorg/lib/dri/sis: Makefile src/external/mit/xorg/lib/dri/tdfx: Makefile src/external/mit/xorg/lib/dri/unichrome: Makefile src/external/mit/xorg/lib/fontconfig/src: Makefile src/external/mit/xorg/lib/libGL: Makefile src/external/mit/xorg/lib/libGLU: Makefile src/external/mit/xorg/lib/libIntelXvMC: Makefile src/external/mit/xorg/lib/libOSMesa: Makefile src/external/mit/xorg/lib/libX11/dynamic: Makefile src/external/mit/xorg/lib/libX11/static: Makefile src/external/mit/xorg/lib/libX11/ximcp: Makefile src/external/mit/xorg/lib/libXaw: Makefile src/external/mit/xorg/lib/libXfont: Makefile src/external/mit/xorg/lib/libXi: Makefile src/external/mit/xorg/lib/libXrandr: Makefile src/external/mit/xorg/lib/libXt: Makefile src/external/mit/xorg/lib/libdrm: Makefile src/external/mit/xorg/lib/libdrm_intel: Makefile src/external/mit/xorg/lib/xcb-util/image: Makefile src/external/mit/xorg/lib/xcb-util/render-util: Makefile src/external/mit/xorg/server/drivers/xf86-video-ast: Makefile src/external/mit/xorg/server/drivers/xf86-video-glint: Makefile src/external/mit/xorg/server/drivers/xf86-video-intel: Makefile src/external/mit/xorg/server/drivers/xf86-video-mach64: Makefile src/external/mit/xorg/server/drivers/xf86-video-mga: Makefile src/external/mit/xorg/server/drivers/xf86-video-openchrome: Makefile src/external/mit/xorg/server/drivers/xf86-video-r128: Makefile src/external/mit/xorg/server/drivers/xf86-video-s3: Makefile src/external/mit/xorg/server/drivers/xf86-video-s3virge: Makefile src/external/mit/xorg/server/drivers/xf86-video-savage: Makefile src/external/mit/xorg/server/drivers/xf86-video-sis: Makefile src/external/mit/xorg/server/drivers/xf86-video-tdfx: Makefile src/external/mit/xorg/server/drivers/xf86-video-trident: Makefile src/external/mit/xorg/server/drivers/xf86-video-tseng: Makefile src/external/mit/xorg/server/xorg-server/Xi: Makefile src/external/mit/xorg/server/xorg-server/dix: Makefile src/external/mit/xorg/server/xorg-server/hw/xfree86/ddc: Makefile src/external/mit/xorg/server/xorg-server/hw/xfree86/int10: Makefile src/external/mit/xorg/server/xorg-server/hw/xfree86/xf86config: Makefile src/external/mit/xorg/server/xorg-server/hw/xfree86/xf86modes: Makefile Log Message: Various warning adjustments for clang To generate a diff of this commit: cvs rdiff -u -r1.2 -r1.3 src/external/mit/xorg/bin/bitmap/Makefile cvs rdiff -u -r1.1.1.1 -r1.2 src/external/mit/xorg/bin/editres/Makefile cvs rdiff -u -r1.1.1.1 -r1.2 src/external/mit/xorg/bin/fonttosfnt/Makefile cvs rdiff -u -r1.4 -r1.5 src/external/mit/xorg/bin/twm/Makefile cvs rdiff -u -r1.2 -r1.3 src/external/mit/xorg/bin/xedit/lisp/Makefile cvs rdiff -u -r1.8 -r1.9 src/external/mit/xorg/bin/xkbcomp/Makefile cvs rdiff -u -r1.5 -r1.6 src/external/mit/xorg/bin/xmh/Makefile cvs rdiff -u -r1.4 -r1.5 src/external/mit/xorg/bin/xrandr/Makefile cvs rdiff -u -r1.4 -r1.5 src/external/mit/xorg/bin/xwininfo/Makefile cvs rdiff -u -r1.2 -r1.3 src/external/mit/xorg/lib/dri/i810/Makefile cvs rdiff -u -r1.10 -r1.11 src/external/mit/xorg/lib/dri/i915/Makefile cvs rdiff -u -r1.12 -r1.13 src/external/mit/xorg/lib/dri/i965/Makefile cvs rdiff -u -r1.8 -r1.9 src/external/mit/xorg/lib/dri/libmesa/Makefile cvs rdiff -u -r1.2 -r1.3 src/external/mit/xorg/lib/dri/mach64/Makefile cvs rdiff -u -r1.2 -r1.3 src/external/mit/xorg/lib/dri/mga/Makefile cvs rdiff -u -r1.3 -r1.4 src/external/mit/xorg/lib/dri/r128/Makefile cvs rdiff -u -r1.7 -r1.8 src/external/mit/xorg/lib/dri/r200/Makefile cvs rdiff -u -r1.7 -r1.8 src/external/mit/xorg/lib/dri/r300/Makefile cvs rdiff -u -r1.3 -r1.4 src/external/mit/xorg/lib/dri/r600/Makefile cvs rdiff -u -r1.7 -r1.8 src/external/mit/xorg/lib/dri/radeon/Makefile cvs rdiff -u -r1.2 -r1.3 src/external/mit/xorg/lib/dri/savage/Makefile cvs rdiff -u -r1.2 -r1.3 src/external/mit/xorg/lib/dri/sis/Makefile cvs rdiff -u -r1.3 -r1.4 src/external/mit/xorg/lib/dri/tdfx/Makefile cvs rdiff -u -r1.2 -r1.3 src/external/mit/xorg/lib/dri/unichrome/Makefile cvs rdiff -u -r1.6 -r1.7 src/external/mit/xorg/lib/fontconfig/src/Makefile cvs rdiff -u -r1.16 -r1.17 src/external/mit/xorg/lib/libGL/Makefile cvs rdiff -u -r1.9 -r1.10 src/external/mit/xorg/lib/libGLU/Makefile cvs rdiff -u -r1.1 -r1.2 src/external/mit/xorg/lib/libIntelXvMC/Makefile cvs rdiff -u -r1.5 -r1.6 src/external/mit/xorg/lib/libOSMesa/Makefile cvs rdiff -u -r1.2 -r1.3 src/external/mit/xorg/lib/libX11/dynamic/Makefile cvs rdiff -u -r1.1.1.1 -r1.2 src/external/mit/xorg/lib/libX11/static/Makefile cvs rdiff -u -r1.1 -r1.2 src/external/mit/xorg/lib/libX11/ximcp/Makefile cvs rdiff -u -r1.8 -r1.9 src/external/mit/xorg/lib/libXaw/Makefile cvs rdiff -u -r1.7 -r1.8 src/external/mit/xorg/lib/libXfont/Makefile cvs rdiff -u -r1.7 -r1.8 src/external/mit/xorg/lib/libXi/Makefile cvs rdiff -u -r1.2 -r1.3 src/external/mit/xorg/lib/libXrandr/Makefile cvs rdiff -u -r1.4 -r1.5 src/external/mit/xorg/lib/libXt/Makefile cvs rdiff -u -r1.7 -r1.8 src/external/mit/xorg/lib/libdrm/Makefile cvs rdiff -u -r1.6 -r1.7 src/external/mit/xorg/lib/libdrm_intel/Makefile cvs rdiff -u -r1.1 -r1.2 src/external/mit/xorg/lib/xcb-util/image/Makefile cvs rdiff -u -r1.1 -r1.2 \ src/external/mit/xorg/lib/xcb-util/render-util/Makefile cvs rdiff -u -r1.3 -r1.4 \ src/external/mit/xorg/server/drivers/xf86-video-ast/Makefile cvs rdiff -u -r1.9 -r1.10 \ src/external/mit/xorg/server/drivers/xf86-video-glint/Makefile cvs rdiff -u -r1.9 -r1.10 \ src/external/mit/xorg/server/drivers/xf86-video-intel/Makefile cvs rdiff -u -r1.5 -r1.6 \ src/external/mit/xorg/server/drivers/xf86-video-mach64/Makefile cvs rdiff -u -r1.8 -r1.9 \ src/external/mit/xorg/server/drivers/xf86-video-mga/Makefile cvs rdiff -u -r1.3 -r1.4 \ src/external/mit/xorg/server/drivers/xf86-video-openchrome/Makefile cvs rdiff -u -r1.4 -r1.5 \ src/external/mit/xorg/server/drivers/xf86-video-r128/Makefile cvs rdiff -u -r1.9 -r1.10 \ src/external/mit/xorg/server/drivers/xf86-video-s3/Makefile cvs rdiff -u -r1.3 -r1.4 \ src/external/mit/xorg/server/drivers/xf86-video-s3virge/Makefile cvs rdiff -u -r1.8 -r1.9 \ src/external/mit/xorg/server/drivers/xf86-video-savage/Makefile cvs rdiff -u -r1.9 -r1.10 \ src/external/mit/xorg/server/drivers/xf86-video-sis/Makefile cvs rdiff -u -r1.7 -r1.8 \ src/external/mit/xorg/server/drivers/xf86-video-tdfx/Makefile cvs rdiff -u -r1.4 -r1.5 \ src/external/mit/xorg/server/drivers/xf86-video-trident/Makefile cvs rdiff -u -r1.3 -r1.4 \ src/external/mit/xorg/server/drivers/xf86-video-tseng/Makefile cvs rdiff -u -r1.3 -r1.4 src/external/mit/xorg/server/xorg-server/Xi/Makefile cvs rdiff -u -r1.10 -r1.11 \ src/external/mit/xorg/server/xorg-server/dix/Makefile cvs rdiff -u -r1.4 -r1.5 \ src/external/mit/xorg/server/xorg-server/hw/xfree86/ddc/Makefile cvs rdiff -u -r1.7 -r1.8 \ src/external/mit/xorg/server/xorg-server/hw/xfree86/int10/Makefile cvs rdiff -u -r1.3 -r1.4 \ src/external/mit/xorg/server/xorg-server/hw/xfree86/xf86config/Makefile cvs rdiff -u -r1.4 -r1.5 \ src/external/mit/xorg/server/xorg-server/hw/xfree86/xf86modes/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/bitmap/Makefile diff -u src/external/mit/xorg/bin/bitmap/Makefile:1.2 src/external/mit/xorg/bin/bitmap/Makefile:1.3 --- src/external/mit/xorg/bin/bitmap/Makefile:1.2 Sun Nov 21 02:33:40 2010 +++ src/external/mit/xorg/bin/bitmap/Makefile Thu Aug 11 23:15:35 2011 @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.2 2010/11/21 02:33:40 mrg Exp $ +# $NetBSD: Makefile,v 1.3 2011/08/11 23:15:35 joerg Exp $ .include <bsd.own.mk> @@ -20,6 +20,8 @@ .PATH: ${X11SRCDIR.bitmap} +CWARNFLAGS.clang+= -Wno-format + .include <bsd.x11.mk> .include <bsd.prog.mk> .include <bsd.subdir.mk> Index: src/external/mit/xorg/bin/editres/Makefile diff -u src/external/mit/xorg/bin/editres/Makefile:1.1.1.1 src/external/mit/xorg/bin/editres/Makefile:1.2 --- src/external/mit/xorg/bin/editres/Makefile:1.1.1.1 Tue Jul 29 05:01:22 2008 +++ src/external/mit/xorg/bin/editres/Makefile Thu Aug 11 23:15:35 2011 @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.1.1.1 2008/07/29 05:01:22 mrg Exp $ +# $NetBSD: Makefile,v 1.2 2011/08/11 23:15:35 joerg Exp $ .include <bsd.own.mk> @@ -14,5 +14,7 @@ .PATH: ${X11SRCDIR.${PROG}} +CWARNFLAGS.clang+= -Wno-format + .include <bsd.x11.mk> .include <bsd.prog.mk> Index: src/external/mit/xorg/bin/fonttosfnt/Makefile diff -u src/external/mit/xorg/bin/fonttosfnt/Makefile:1.1.1.1 src/external/mit/xorg/bin/fonttosfnt/Makefile:1.2 --- src/external/mit/xorg/bin/fonttosfnt/Makefile:1.1.1.1 Tue Jul 29 05:01:22 2008 +++ src/external/mit/xorg/bin/fonttosfnt/Makefile Thu Aug 11 23:15:35 2011 @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.1.1.1 2008/07/29 05:01:22 mrg Exp $ +# $NetBSD: Makefile,v 1.2 2011/08/11 23:15:35 joerg Exp $ .include <bsd.own.mk> @@ -18,5 +18,7 @@ .PATH: ${X11SRCDIR.${PROG}} +CWARNFLAGS.clang+= -Wno-format + .include <bsd.x11.mk> .include <bsd.prog.mk> Index: src/external/mit/xorg/bin/twm/Makefile diff -u src/external/mit/xorg/bin/twm/Makefile:1.4 src/external/mit/xorg/bin/twm/Makefile:1.5 --- src/external/mit/xorg/bin/twm/Makefile:1.4 Sun Nov 21 02:33:41 2010 +++ src/external/mit/xorg/bin/twm/Makefile Thu Aug 11 23:15:35 2011 @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.4 2010/11/21 02:33:41 mrg Exp $ +# $NetBSD: Makefile,v 1.5 2011/08/11 23:15:35 joerg Exp $ .include <bsd.own.mk> @@ -44,5 +44,7 @@ .PATH: ${TWMDIR}/src ${TWMDIR}/man +CWARNFLAGS.clang+= -Wno-pointer-sign + .include <bsd.x11.mk> .include <bsd.prog.mk> Index: src/external/mit/xorg/bin/xedit/lisp/Makefile diff -u src/external/mit/xorg/bin/xedit/lisp/Makefile:1.2 src/external/mit/xorg/bin/xedit/lisp/Makefile:1.3 --- src/external/mit/xorg/bin/xedit/lisp/Makefile:1.2 Fri Mar 18 10:50:36 2011 +++ src/external/mit/xorg/bin/xedit/lisp/Makefile Thu Aug 11 23:15:35 2011 @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.2 2011/03/18 10:50:36 plunky Exp $ +# $NetBSD: Makefile,v 1.3 2011/08/11 23:15:35 joerg Exp $ MKPRIVATELIB= yes @@ -23,5 +23,7 @@ .PATH: ${X11SRCDIR.xedit}/lisp +CWARNFLAGS.clang+= -Wno-format + .include <bsd.x11.mk> .include <bsd.lib.mk> Index: src/external/mit/xorg/bin/xkbcomp/Makefile diff -u src/external/mit/xorg/bin/xkbcomp/Makefile:1.8 src/external/mit/xorg/bin/xkbcomp/Makefile:1.9 --- src/external/mit/xorg/bin/xkbcomp/Makefile:1.8 Sat Jul 30 11:18:23 2011 +++ src/external/mit/xorg/bin/xkbcomp/Makefile Thu Aug 11 23:15:35 2011 @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.8 2011/07/30 11:18:23 tron Exp $ +# $NetBSD: Makefile,v 1.9 2011/08/11 23:15:35 joerg Exp $ .include <bsd.own.mk> .include "Makefile.common" @@ -27,5 +27,7 @@ .PATH: ${X11SRCDIR.${PROG}} .PATH: ${X11SRCDIR.${PROG}}/man +CWARNFLAGS.clang+= -Wno-parentheses + .include <bsd.x11.mk> .include <bsd.prog.mk> Index: src/external/mit/xorg/bin/xmh/Makefile diff -u src/external/mit/xorg/bin/xmh/Makefile:1.5 src/external/mit/xorg/bin/xmh/Makefile:1.6 --- src/external/mit/xorg/bin/xmh/Makefile:1.5 Sat Nov 20 23:47:30 2010 +++ src/external/mit/xorg/bin/xmh/Makefile Thu Aug 11 23:15:36 2011 @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.5 2010/11/20 23:47:30 mrg Exp $ +# $NetBSD: Makefile,v 1.6 2011/08/11 23:15:36 joerg Exp $ .include <bsd.own.mk> @@ -20,5 +20,7 @@ .PATH: ${X11SRCDIR.${PROG}} ${X11SRCDIR.${PROG}}/app-defaults +CWARNFLAGS.clang+= -Wno-format + .include <bsd.x11.mk> .include <bsd.prog.mk> Index: src/external/mit/xorg/bin/xrandr/Makefile diff -u src/external/mit/xorg/bin/xrandr/Makefile:1.4 src/external/mit/xorg/bin/xrandr/Makefile:1.5 --- src/external/mit/xorg/bin/xrandr/Makefile:1.4 Sat Jul 23 06:06:41 2011 +++ src/external/mit/xorg/bin/xrandr/Makefile Thu Aug 11 23:15:36 2011 @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.4 2011/07/23 06:06:41 mrg Exp $ +# $NetBSD: Makefile,v 1.5 2011/08/11 23:15:36 joerg Exp $ .include <bsd.own.mk> @@ -11,5 +11,7 @@ .PATH: ${X11SRCDIR.${PROG}} ${X11SRCDIR.${PROG}}/man +CWARNFLAGS.clang+= -Wno-parentheses + .include <bsd.x11.mk> .include <bsd.prog.mk> Index: src/external/mit/xorg/bin/xwininfo/Makefile diff -u src/external/mit/xorg/bin/xwininfo/Makefile:1.4 src/external/mit/xorg/bin/xwininfo/Makefile:1.5 --- src/external/mit/xorg/bin/xwininfo/Makefile:1.4 Sat Jul 23 07:11:49 2011 +++ src/external/mit/xorg/bin/xwininfo/Makefile Thu Aug 11 23:15:36 2011 @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.4 2011/07/23 07:11:49 mrg Exp $ +# $NetBSD: Makefile,v 1.5 2011/08/11 23:15:36 joerg Exp $ .include <bsd.own.mk> @@ -13,5 +13,7 @@ LDADD+= -lXmuu -lXt -lSM -lICE -lXext -lX11 -lxcb -lxcb-shape DPADD+= ${LIBXMUU} ${LIBXT} ${LIBSM} ${LIBICE} ${LIBXEXT} ${LIBX11} ${LIBXCB} ${LIBXCB_SHAPE} +CWARNFLAGS.clang+= -Wno-tautological-compare + .include <bsd.x11.mk> .include <bsd.prog.mk> Index: src/external/mit/xorg/lib/dri/i810/Makefile diff -u src/external/mit/xorg/lib/dri/i810/Makefile:1.2 src/external/mit/xorg/lib/dri/i810/Makefile:1.3 --- src/external/mit/xorg/lib/dri/i810/Makefile:1.2 Sun Sep 21 14:08:45 2008 +++ src/external/mit/xorg/lib/dri/i810/Makefile Thu Aug 11 23:15:36 2011 @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.2 2008/09/21 14:08:45 lukem Exp $ +# $NetBSD: Makefile,v 1.3 2011/08/11 23:15:36 joerg Exp $ MODULE= i810 @@ -6,4 +6,6 @@ i810state.c i810tex.c i810texmem.c i810texstate.c i810tris.c \ i810vb.c +CWARNFLAGS.clang+= -Wno-constant-logical-operand + .include "${.CURDIR}/../dri.mk" Index: src/external/mit/xorg/lib/dri/i915/Makefile diff -u src/external/mit/xorg/lib/dri/i915/Makefile:1.10 src/external/mit/xorg/lib/dri/i915/Makefile:1.11 --- src/external/mit/xorg/lib/dri/i915/Makefile:1.10 Mon Jul 19 05:34:24 2010 +++ src/external/mit/xorg/lib/dri/i915/Makefile Thu Aug 11 23:15:36 2011 @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.10 2010/07/19 05:34:24 mrg Exp $ +# $NetBSD: Makefile,v 1.11 2011/08/11 23:15:36 joerg Exp $ MODULE= i915 @@ -58,5 +58,7 @@ COPTS.intel_context.c+= -Wno-error # XXX COPTS.intel_tex.c+= -Wno-error # XXX +CWARNFLAGS.clang+= -Wno-tautological-compare -Wno-format \ + -Wno-constant-logical-operand .include "${.CURDIR}/../dri.mk" Index: src/external/mit/xorg/lib/dri/i965/Makefile diff -u src/external/mit/xorg/lib/dri/i965/Makefile:1.12 src/external/mit/xorg/lib/dri/i965/Makefile:1.13 --- src/external/mit/xorg/lib/dri/i965/Makefile:1.12 Mon Jul 19 05:34:24 2010 +++ src/external/mit/xorg/lib/dri/i965/Makefile Thu Aug 11 23:15:36 2011 @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.12 2010/07/19 05:34:24 mrg Exp $ +# $NetBSD: Makefile,v 1.13 2011/08/11 23:15:36 joerg Exp $ MODULE= i965 @@ -102,6 +102,7 @@ gen6_wm_state.c COPTS.brw_draw_upload.c= -Wno-error +CWARNFLAGS.clang+= -Wno-format 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.8 src/external/mit/xorg/lib/dri/libmesa/Makefile:1.9 --- src/external/mit/xorg/lib/dri/libmesa/Makefile:1.8 Mon Jul 19 05:34:24 2010 +++ src/external/mit/xorg/lib/dri/libmesa/Makefile Thu Aug 11 23:15:36 2011 @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.8 2010/07/19 05:34:24 mrg Exp $ +# $NetBSD: Makefile,v 1.9 2011/08/11 23:15:36 joerg Exp $ .include <bsd.own.mk> @@ -35,4 +35,6 @@ #LIBDPLIBS+= GL ${.CURDIR}/../../libGL +CWARNFLAGS.clang+= -Wno-format + .include <bsd.lib.mk> Index: src/external/mit/xorg/lib/dri/mach64/Makefile diff -u src/external/mit/xorg/lib/dri/mach64/Makefile:1.2 src/external/mit/xorg/lib/dri/mach64/Makefile:1.3 --- src/external/mit/xorg/lib/dri/mach64/Makefile:1.2 Sun Sep 21 14:08:45 2008 +++ src/external/mit/xorg/lib/dri/mach64/Makefile Thu Aug 11 23:15:36 2011 @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.2 2008/09/21 14:08:45 lukem Exp $ +# $NetBSD: Makefile,v 1.3 2011/08/11 23:15:36 joerg Exp $ MODULE= mach64 @@ -6,4 +6,6 @@ mach64_state.c mach64_tex.c mach64_texmem.c mach64_texstate.c \ mach64_tris.c mach64_vb.c mach64_dd.c mach64_lock.c +CWARNFLAGS.clang+= -Wno-constant-logical-operand + .include "${.CURDIR}/../dri.mk" Index: src/external/mit/xorg/lib/dri/mga/Makefile diff -u src/external/mit/xorg/lib/dri/mga/Makefile:1.2 src/external/mit/xorg/lib/dri/mga/Makefile:1.3 --- src/external/mit/xorg/lib/dri/mga/Makefile:1.2 Sun Sep 21 14:08:45 2008 +++ src/external/mit/xorg/lib/dri/mga/Makefile Thu Aug 11 23:15:36 2011 @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.2 2008/09/21 14:08:45 lukem Exp $ +# $NetBSD: Makefile,v 1.3 2011/08/11 23:15:36 joerg Exp $ MODULE= mga @@ -6,4 +6,6 @@ mgaspan.c mgatex.c mgatexmem.c mga_texstate.c mga_texcombine.c \ mgavb.c mga_xmesa.c +CWARNFLAGS.clang+= -Wno-constant-logical-operand + .include "${.CURDIR}/../dri.mk" Index: src/external/mit/xorg/lib/dri/r128/Makefile diff -u src/external/mit/xorg/lib/dri/r128/Makefile:1.3 src/external/mit/xorg/lib/dri/r128/Makefile:1.4 --- src/external/mit/xorg/lib/dri/r128/Makefile:1.3 Thu Jun 11 01:47:08 2009 +++ src/external/mit/xorg/lib/dri/r128/Makefile Thu Aug 11 23:15:37 2011 @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.3 2009/06/11 01:47:08 mrg Exp $ +# $NetBSD: Makefile,v 1.4 2011/08/11 23:15:37 joerg Exp $ MODULE= r128 @@ -7,5 +7,6 @@ r128_texmem.c COPTS.r128_span.c= -Wno-error # XXX const +CWARNFLAGS.clang+= -Wno-constant-logical-operand .include "${.CURDIR}/../dri.mk" Index: src/external/mit/xorg/lib/dri/r200/Makefile diff -u src/external/mit/xorg/lib/dri/r200/Makefile:1.7 src/external/mit/xorg/lib/dri/r200/Makefile:1.8 --- src/external/mit/xorg/lib/dri/r200/Makefile:1.7 Mon Jul 19 05:34:24 2010 +++ src/external/mit/xorg/lib/dri/r200/Makefile Thu Aug 11 23:15:37 2011 @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.7 2010/07/19 05:34:24 mrg Exp $ +# $NetBSD: Makefile,v 1.8 2011/08/11 23:15:37 joerg Exp $ MODULE= r200 @@ -55,4 +55,7 @@ COPTS.radeon_screen.c= -Wno-error # XXX const +CWARNFLAGS.clang+= -Wno-format -Wno-constant-logical-operand \ + -Wno-empty-body + .include "${.CURDIR}/../dri.mk" Index: src/external/mit/xorg/lib/dri/r300/Makefile diff -u src/external/mit/xorg/lib/dri/r300/Makefile:1.7 src/external/mit/xorg/lib/dri/r300/Makefile:1.8 --- src/external/mit/xorg/lib/dri/r300/Makefile:1.7 Mon Jul 19 05:34:25 2010 +++ src/external/mit/xorg/lib/dri/r300/Makefile Thu Aug 11 23:15:37 2011 @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.7 2010/07/19 05:34:25 mrg Exp $ +# $NetBSD: Makefile,v 1.8 2011/08/11 23:15:37 joerg Exp $ MODULE= r300 @@ -87,4 +87,7 @@ # uses C99 variable decl scoping CFLAGS+= -std=c99 +CWARNFLAGS.clang+= -Wno-empty-body -Wno-format -Wno-constant-conversion \ + -Wno-constant-logical-operand + .include "${.CURDIR}/../dri.mk" Index: src/external/mit/xorg/lib/dri/r600/Makefile diff -u src/external/mit/xorg/lib/dri/r600/Makefile:1.3 src/external/mit/xorg/lib/dri/r600/Makefile:1.4 --- src/external/mit/xorg/lib/dri/r600/Makefile:1.3 Mon Jul 19 05:34:25 2010 +++ src/external/mit/xorg/lib/dri/r600/Makefile Thu Aug 11 23:15:37 2011 @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.3 2010/07/19 05:34:25 mrg Exp $ +# $NetBSD: Makefile,v 1.4 2011/08/11 23:15:37 joerg Exp $ MODULE= r600 @@ -58,4 +58,7 @@ COPTS.radeon_screen.c= -Wno-error # XXX const COPTS.r700_assembler.c= -Wno-error # XXX pointer casts +CWARNFLAGS.clang+= -Wno-constant-logical-operand -Wno-empty-body \ + -Wno-format + .include "${.CURDIR}/../dri.mk" Index: src/external/mit/xorg/lib/dri/radeon/Makefile diff -u src/external/mit/xorg/lib/dri/radeon/Makefile:1.7 src/external/mit/xorg/lib/dri/radeon/Makefile:1.8 --- src/external/mit/xorg/lib/dri/radeon/Makefile:1.7 Mon Jul 19 05:34:26 2010 +++ src/external/mit/xorg/lib/dri/radeon/Makefile Thu Aug 11 23:15:37 2011 @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.7 2010/07/19 05:34:26 mrg Exp $ +# $NetBSD: Makefile,v 1.8 2011/08/11 23:15:37 joerg Exp $ MODULE= radeon @@ -48,4 +48,7 @@ COPTS.radeon_screen.c= -Wno-error # XXX const +CWARNFLAGS.clang+= -Wno-constant-logical-operand -Wno-empty-body \ + -Wno-format + .include "${.CURDIR}/../dri.mk" Index: src/external/mit/xorg/lib/dri/savage/Makefile diff -u src/external/mit/xorg/lib/dri/savage/Makefile:1.2 src/external/mit/xorg/lib/dri/savage/Makefile:1.3 --- src/external/mit/xorg/lib/dri/savage/Makefile:1.2 Sun Sep 21 14:08:46 2008 +++ src/external/mit/xorg/lib/dri/savage/Makefile Thu Aug 11 23:15:37 2011 @@ -1,8 +1,10 @@ -# $NetBSD: Makefile,v 1.2 2008/09/21 14:08:46 lukem Exp $ +# $NetBSD: Makefile,v 1.3 2011/08/11 23:15:37 joerg Exp $ MODULE= savage SRCS= savage_xmesa.c savagedd.c savagestate.c savagetex.c savagetris.c \ savagerender.c savageioctl.c savagespan.c +CWARNFLAGS.clang+= -Wno-constant-logical-operand -Wno-error + .include "${.CURDIR}/../dri.mk" Index: src/external/mit/xorg/lib/dri/sis/Makefile diff -u src/external/mit/xorg/lib/dri/sis/Makefile:1.2 src/external/mit/xorg/lib/dri/sis/Makefile:1.3 --- src/external/mit/xorg/lib/dri/sis/Makefile:1.2 Sun Sep 21 14:08:46 2008 +++ src/external/mit/xorg/lib/dri/sis/Makefile Thu Aug 11 23:15:37 2011 @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.2 2008/09/21 14:08:46 lukem Exp $ +# $NetBSD: Makefile,v 1.3 2011/08/11 23:15:37 joerg Exp $ MODULE= sis @@ -6,4 +6,6 @@ sis_dd.c sis_fog.c sis_lock.c sis_screen.c sis_span.c sis_state.c \ sis_stencil.c sis_tex.c sis_texstate.c sis_tris.c +CWARNFLAGS.clang+= -Wno-constant-logical-operand + .include "${.CURDIR}/../dri.mk" Index: src/external/mit/xorg/lib/dri/tdfx/Makefile diff -u src/external/mit/xorg/lib/dri/tdfx/Makefile:1.3 src/external/mit/xorg/lib/dri/tdfx/Makefile:1.4 --- src/external/mit/xorg/lib/dri/tdfx/Makefile:1.3 Thu Jun 11 01:47:08 2009 +++ src/external/mit/xorg/lib/dri/tdfx/Makefile Thu Aug 11 23:15:37 2011 @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.3 2009/06/11 01:47:08 mrg Exp $ +# $NetBSD: Makefile,v 1.4 2011/08/11 23:15:37 joerg Exp $ MODULE= tdfx @@ -7,5 +7,7 @@ tdfx_texstate.c tdfx_tris.c tdfx_vb.c COPTS.tdfx_screen.c= -Wno-error # XXX const +CWARNFLAGS.clang+= -Wno-constant-logical-operand \ + -Wno-tautological-compare .include "${.CURDIR}/../dri.mk" Index: src/external/mit/xorg/lib/dri/unichrome/Makefile diff -u src/external/mit/xorg/lib/dri/unichrome/Makefile:1.2 src/external/mit/xorg/lib/dri/unichrome/Makefile:1.3 --- src/external/mit/xorg/lib/dri/unichrome/Makefile:1.2 Sun Sep 21 14:08:46 2008 +++ src/external/mit/xorg/lib/dri/unichrome/Makefile Thu Aug 11 23:15:38 2011 @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.2 2008/09/21 14:08:46 lukem Exp $ +# $NetBSD: Makefile,v 1.3 2011/08/11 23:15:38 joerg Exp $ MODULE= unichrome @@ -8,4 +8,6 @@ via_render.c via_screen.c via_span.c via_state.c via_texcombine.c \ via_tris.c +CWARNFLAGS.clang+= -Wno-constant-logical-operand + .include "${.CURDIR}/../dri.mk" Index: src/external/mit/xorg/lib/fontconfig/src/Makefile diff -u src/external/mit/xorg/lib/fontconfig/src/Makefile:1.6 src/external/mit/xorg/lib/fontconfig/src/Makefile:1.7 --- src/external/mit/xorg/lib/fontconfig/src/Makefile:1.6 Sun Nov 21 07:45:36 2010 +++ src/external/mit/xorg/lib/fontconfig/src/Makefile Thu Aug 11 23:15:38 2011 @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.6 2010/11/21 07:45:36 mrg Exp $ +# $NetBSD: Makefile,v 1.7 2011/08/11 23:15:38 joerg Exp $ .include <bsd.own.mk> @@ -119,5 +119,7 @@ # XXX CPPFLAGS.fcxml.c= -Wno-error +CWARNFLAGS.clang+= -Wno-pointer-sign + .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.16 src/external/mit/xorg/lib/libGL/Makefile:1.17 --- src/external/mit/xorg/lib/libGL/Makefile:1.16 Mon Nov 22 21:05:29 2010 +++ src/external/mit/xorg/lib/libGL/Makefile Thu Aug 11 23:15:38 2011 @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.16 2010/11/22 21:05:29 mrg Exp $ +# $NetBSD: Makefile,v 1.17 2011/08/11 23:15:38 joerg Exp $ .include <bsd.own.mk> @@ -109,6 +109,8 @@ .include "${.CURDIR}/../libGL/mesa-ver.mk" PKGCONFIG_VERSION.gl= ${MESA_VER} +CWARNFLAGS.clang+= -Wno-tautological-compare -Wno-format + .include <bsd.x11.mk> .include <bsd.lib.mk> .include <bsd.subdir.mk> Index: src/external/mit/xorg/lib/libGLU/Makefile diff -u src/external/mit/xorg/lib/libGLU/Makefile:1.9 src/external/mit/xorg/lib/libGLU/Makefile:1.10 --- src/external/mit/xorg/lib/libGLU/Makefile:1.9 Fri Jul 1 01:25:52 2011 +++ src/external/mit/xorg/lib/libGLU/Makefile Thu Aug 11 23:15:38 2011 @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.9 2011/07/01 01:25:52 mrg Exp $ +# $NetBSD: Makefile,v 1.10 2011/08/11 23:15:38 joerg Exp $ NOLINT= 1 # XTODO: tess.ln SIGSEGVs lint :( @@ -96,3 +96,5 @@ COPTS.sorter.cc+= -Wno-error COPTS.tobezier.cc+= -Wno-error .endif + +CWARNFLAGS.clang+= -Wno-parentheses Index: src/external/mit/xorg/lib/libIntelXvMC/Makefile diff -u src/external/mit/xorg/lib/libIntelXvMC/Makefile:1.1 src/external/mit/xorg/lib/libIntelXvMC/Makefile:1.2 --- src/external/mit/xorg/lib/libIntelXvMC/Makefile:1.1 Tue Jan 18 23:33:51 2011 +++ src/external/mit/xorg/lib/libIntelXvMC/Makefile Thu Aug 11 23:15:38 2011 @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.1 2011/01/18 23:33:51 jmcneill Exp $ +# $NetBSD: Makefile,v 1.2 2011/08/11 23:15:38 joerg Exp $ .include <bsd.own.mk> @@ -27,5 +27,7 @@ XvMC ${.CURDIR}/../libXvMC \ drm ${.CURDIR}/../libdrm +CWARNFLAGS.clang+= -Wno-pointer-sign -Wno-format -Wno-parentheses + .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.5 src/external/mit/xorg/lib/libOSMesa/Makefile:1.6 --- src/external/mit/xorg/lib/libOSMesa/Makefile:1.5 Tue Jun 16 05:21:58 2009 +++ src/external/mit/xorg/lib/libOSMesa/Makefile Thu Aug 11 23:15:38 2011 @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.5 2009/06/16 05:21:58 mrg Exp $ +# $NetBSD: Makefile,v 1.6 2011/08/11 23:15:38 joerg Exp $ .include <bsd.own.mk> @@ -16,6 +16,8 @@ -D_NETBSD_SOURCE -DUSE_EXTERNAL_DXTN_LIB=1 -DHAVE_ALIAS CFLAGS+= -pthread +CWARNFLAGS.clang+= -Wno-format + .include "libmesa.mk" .include <bsd.x11.mk> Index: src/external/mit/xorg/lib/libX11/dynamic/Makefile diff -u src/external/mit/xorg/lib/libX11/dynamic/Makefile:1.2 src/external/mit/xorg/lib/libX11/dynamic/Makefile:1.3 --- src/external/mit/xorg/lib/libX11/dynamic/Makefile:1.2 Wed Feb 23 07:53:29 2011 +++ src/external/mit/xorg/lib/libX11/dynamic/Makefile Thu Aug 11 23:15:38 2011 @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.2 2011/02/23 07:53:29 mrg Exp $ +# $NetBSD: Makefile,v 1.3 2011/08/11 23:15:38 joerg Exp $ NOLINT= 1 NOPROFILE= 1 @@ -23,5 +23,7 @@ Xdmcp ${.CURDIR}/../../libXdmcp \ Xau ${.CURDIR}/../../libXau +CWARNFLAGS.clang+= -Wno-parentheses + .include <bsd.x11.mk> .include <bsd.lib.mk> Index: src/external/mit/xorg/lib/libX11/static/Makefile diff -u src/external/mit/xorg/lib/libX11/static/Makefile:1.1.1.1 src/external/mit/xorg/lib/libX11/static/Makefile:1.2 --- src/external/mit/xorg/lib/libX11/static/Makefile:1.1.1.1 Tue Jul 29 05:01:22 2008 +++ src/external/mit/xorg/lib/libX11/static/Makefile Thu Aug 11 23:15:38 2011 @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.1.1.1 2008/07/29 05:01:22 mrg Exp $ +# $NetBSD: Makefile,v 1.2 2011/08/11 23:15:38 joerg Exp $ NOPIC= 1 @@ -20,5 +20,7 @@ XlcDL.c \ XlcSL.c +CWARNFLAGS.clang+= -Wno-parentheses + .include <bsd.x11.mk> .include <bsd.lib.mk> Index: src/external/mit/xorg/lib/libX11/ximcp/Makefile diff -u src/external/mit/xorg/lib/libX11/ximcp/Makefile:1.1 src/external/mit/xorg/lib/libX11/ximcp/Makefile:1.2 --- src/external/mit/xorg/lib/libX11/ximcp/Makefile:1.1 Sun Sep 7 13:15:11 2008 +++ src/external/mit/xorg/lib/libX11/ximcp/Makefile Thu Aug 11 23:15:38 2011 @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.1 2008/09/07 13:15:11 rtr Exp $ +# $NetBSD: Makefile,v 1.2 2011/08/11 23:15:38 joerg Exp $ LIBISMODULE= yes SHLIB_MAJOR= 2 # XXX @@ -11,4 +11,6 @@ LIBDIR= ${X11LIBDIR}/locale/lib/common SRCS= ${SRCS.ximcp} +CWARNFLAGS.clang+= -Wno-unused + .include "../Makefile.ximcp" Index: src/external/mit/xorg/lib/libXaw/Makefile diff -u src/external/mit/xorg/lib/libXaw/Makefile:1.8 src/external/mit/xorg/lib/libXaw/Makefile:1.9 --- src/external/mit/xorg/lib/libXaw/Makefile:1.8 Fri Jul 1 01:25:52 2011 +++ src/external/mit/xorg/lib/libXaw/Makefile Thu Aug 11 23:15:38 2011 @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.8 2011/07/01 01:25:52 mrg Exp $ +# $NetBSD: Makefile,v 1.9 2011/08/11 23:15:38 joerg Exp $ .include <bsd.own.mk> @@ -75,3 +75,5 @@ .if defined(HAVE_GCC) COPTS.XawIm.c+= -Wno-error .endif + +CWARNFLAGS.clang+= -Wno-format Index: src/external/mit/xorg/lib/libXfont/Makefile diff -u src/external/mit/xorg/lib/libXfont/Makefile:1.7 src/external/mit/xorg/lib/libXfont/Makefile:1.8 --- src/external/mit/xorg/lib/libXfont/Makefile:1.7 Wed Jun 10 08:30:35 2009 +++ src/external/mit/xorg/lib/libXfont/Makefile Thu Aug 11 23:15:39 2011 @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.7 2009/06/10 08:30:35 mrg Exp $ +# $NetBSD: Makefile,v 1.8 2011/08/11 23:15:39 joerg Exp $ .include <bsd.own.mk> @@ -65,5 +65,7 @@ PKGDIST= ${LIB} +CWARNFLAGS.clang+= -Wno-tautological-compare + .include <bsd.x11.mk> .include <bsd.lib.mk> Index: src/external/mit/xorg/lib/libXi/Makefile diff -u src/external/mit/xorg/lib/libXi/Makefile:1.7 src/external/mit/xorg/lib/libXi/Makefile:1.8 --- src/external/mit/xorg/lib/libXi/Makefile:1.7 Sat Jul 23 21:37:28 2011 +++ src/external/mit/xorg/lib/libXi/Makefile Thu Aug 11 23:15:39 2011 @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.7 2011/07/23 21:37:28 mrg Exp $ +# $NetBSD: Makefile,v 1.8 2011/08/11 23:15:39 joerg Exp $ .include <bsd.own.mk> @@ -79,5 +79,7 @@ COPTS.XExtInt.c+= -Wno-error # XXX COPTS.XSndExEv.c+= -Wno-error # XXX +CWARNFLAGS.clang+= -Wno-pointer-sign + .include <bsd.x11.mk> .include <bsd.lib.mk> Index: src/external/mit/xorg/lib/libXrandr/Makefile diff -u src/external/mit/xorg/lib/libXrandr/Makefile:1.2 src/external/mit/xorg/lib/libXrandr/Makefile:1.3 --- src/external/mit/xorg/lib/libXrandr/Makefile:1.2 Sat Sep 13 04:32:31 2008 +++ src/external/mit/xorg/lib/libXrandr/Makefile Thu Aug 11 23:15:39 2011 @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.2 2008/09/13 04:32:31 cube Exp $ +# $NetBSD: Makefile,v 1.3 2011/08/11 23:15:39 joerg Exp $ .include <bsd.own.mk> @@ -25,5 +25,7 @@ PKGDIST= ${LIB} +CWARNFLAGS.clang+= -Wno-pointer-sign + .include <bsd.x11.mk> .include <bsd.lib.mk> Index: src/external/mit/xorg/lib/libXt/Makefile diff -u src/external/mit/xorg/lib/libXt/Makefile:1.4 src/external/mit/xorg/lib/libXt/Makefile:1.5 --- src/external/mit/xorg/lib/libXt/Makefile:1.4 Sat Jul 23 12:27:41 2011 +++ src/external/mit/xorg/lib/libXt/Makefile Thu Aug 11 23:15:39 2011 @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.4 2011/07/23 12:27:41 mrg Exp $ +# $NetBSD: Makefile,v 1.5 2011/08/11 23:15:39 joerg Exp $ .include <bsd.own.mk> @@ -303,5 +303,7 @@ PKGDIST= ${LIB} +CWARNFLAGS.clang+= -Wno-tautological-compare + .include <bsd.x11.mk> .include <bsd.lib.mk> Index: src/external/mit/xorg/lib/libdrm/Makefile diff -u src/external/mit/xorg/lib/libdrm/Makefile:1.7 src/external/mit/xorg/lib/libdrm/Makefile:1.8 --- src/external/mit/xorg/lib/libdrm/Makefile:1.7 Sat May 22 23:19:24 2010 +++ src/external/mit/xorg/lib/libdrm/Makefile Thu Aug 11 23:15:39 2011 @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.7 2010/05/22 23:19:24 mrg Exp $ +# $NetBSD: Makefile,v 1.8 2011/08/11 23:15:39 joerg Exp $ .include <bsd.own.mk> @@ -17,6 +17,8 @@ PKGCONFIG= libdrm PKGDIST= ${LIB} +CWARNFLAGS.clang+= -Wno-conversion -Wno-tautological-compare + .include <bsd.x11.mk> .include <bsd.lib.mk> .include <bsd.subdir.mk> Index: src/external/mit/xorg/lib/libdrm_intel/Makefile diff -u src/external/mit/xorg/lib/libdrm_intel/Makefile:1.6 src/external/mit/xorg/lib/libdrm_intel/Makefile:1.7 --- src/external/mit/xorg/lib/libdrm_intel/Makefile:1.6 Thu Jun 3 09:43:16 2010 +++ src/external/mit/xorg/lib/libdrm_intel/Makefile Thu Aug 11 23:15:39 2011 @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.6 2010/06/03 09:43:16 veego Exp $ +# $NetBSD: Makefile,v 1.7 2011/08/11 23:15:39 joerg Exp $ .include <bsd.own.mk> @@ -15,5 +15,7 @@ PKGCONFIG= libdrm_intel PKGDIST= drm +CWARNFLAGS.clang+= -Wno-pointer-sign + .include <bsd.x11.mk> .include <bsd.lib.mk> Index: src/external/mit/xorg/lib/xcb-util/image/Makefile diff -u src/external/mit/xorg/lib/xcb-util/image/Makefile:1.1 src/external/mit/xorg/lib/xcb-util/image/Makefile:1.2 --- src/external/mit/xorg/lib/xcb-util/image/Makefile:1.1 Sun Jul 18 07:01:39 2010 +++ src/external/mit/xorg/lib/xcb-util/image/Makefile Thu Aug 11 23:15:39 2011 @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.1 2010/07/18 07:01:39 mrg Exp $ +# $NetBSD: Makefile,v 1.2 2011/08/11 23:15:39 joerg Exp $ XCBUTIL= image @@ -12,3 +12,5 @@ xcb-aux ${.CURDIR}/../aux CPPFLAGS+= -I${X11SRCDIR.xcb-util}/aux + +CWARNFLAGS.clang+= -Wno-return-type Index: src/external/mit/xorg/lib/xcb-util/render-util/Makefile diff -u src/external/mit/xorg/lib/xcb-util/render-util/Makefile:1.1 src/external/mit/xorg/lib/xcb-util/render-util/Makefile:1.2 --- src/external/mit/xorg/lib/xcb-util/render-util/Makefile:1.1 Sun Jul 18 07:01:39 2010 +++ src/external/mit/xorg/lib/xcb-util/render-util/Makefile Thu Aug 11 23:15:39 2011 @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.1 2010/07/18 07:01:39 mrg Exp $ +# $NetBSD: Makefile,v 1.2 2011/08/11 23:15:39 joerg Exp $ XCBUTIL= render-util @@ -14,3 +14,5 @@ # xxx render-util vs renderutil CPPFLAGS+= -I${X11SRCDIR.xcb-util}/renderutil .PATH: ${X11SRCDIR.xcb-util}/renderutil + +CWARNFLAGS.clang+= -Wno-tautological-compare Index: src/external/mit/xorg/server/drivers/xf86-video-ast/Makefile diff -u src/external/mit/xorg/server/drivers/xf86-video-ast/Makefile:1.3 src/external/mit/xorg/server/drivers/xf86-video-ast/Makefile:1.4 --- src/external/mit/xorg/server/drivers/xf86-video-ast/Makefile:1.3 Sun Aug 3 09:24:14 2008 +++ src/external/mit/xorg/server/drivers/xf86-video-ast/Makefile Thu Aug 11 23:15:39 2011 @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.3 2008/08/03 09:24:14 rtr Exp $ +# $NetBSD: Makefile,v 1.4 2011/08/11 23:15:39 joerg Exp $ DRIVER= xf86-video-ast DRIVER_NAME= ast_drv @@ -6,4 +6,6 @@ SRCS= ast_2dtool.c ast_accel.c ast_cursor.c ast_driver.c SRCS+= ast_mode.c ast_tool.c ast_vgatool.c +CWARNFLAGS.clang+= -Wno-format + .include "../Makefile.xf86-driver" Index: src/external/mit/xorg/server/drivers/xf86-video-glint/Makefile diff -u src/external/mit/xorg/server/drivers/xf86-video-glint/Makefile:1.9 src/external/mit/xorg/server/drivers/xf86-video-glint/Makefile:1.10 --- src/external/mit/xorg/server/drivers/xf86-video-glint/Makefile:1.9 Sat May 22 23:04:01 2010 +++ src/external/mit/xorg/server/drivers/xf86-video-glint/Makefile Thu Aug 11 23:15:39 2011 @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.9 2010/05/22 23:04:01 mrg Exp $ +# $NetBSD: Makefile,v 1.10 2011/08/11 23:15:39 joerg Exp $ DRIVER= xf86-video-glint DRIVER_NAME= glint_drv @@ -24,4 +24,6 @@ COPTS.glint_driver.c= -Wno-error # XXX xf86dgastr.h +CWARNFLAGS.clang+= -Wno-format + .include "../Makefile.xf86-driver" Index: src/external/mit/xorg/server/drivers/xf86-video-intel/Makefile diff -u src/external/mit/xorg/server/drivers/xf86-video-intel/Makefile:1.9 src/external/mit/xorg/server/drivers/xf86-video-intel/Makefile:1.10 --- src/external/mit/xorg/server/drivers/xf86-video-intel/Makefile:1.9 Tue Jan 18 23:33:52 2011 +++ src/external/mit/xorg/server/drivers/xf86-video-intel/Makefile Thu Aug 11 23:15:40 2011 @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.9 2011/01/18 23:33:52 jmcneill Exp $ +# $NetBSD: Makefile,v 1.10 2011/08/11 23:15:40 joerg Exp $ DRIVER= xf86-video-intel DRIVER_NAME= intel_drv @@ -27,4 +27,7 @@ SUBDIR= ch7017 ch7xxx ivch sil164 tfp410 +CWARNFLAGS.clang+= -Wno-parentheses -Wno-tautological-compare \ + -Wno-empty-body -Wno-error + .include <bsd.subdir.mk> Index: src/external/mit/xorg/server/drivers/xf86-video-mach64/Makefile diff -u src/external/mit/xorg/server/drivers/xf86-video-mach64/Makefile:1.5 src/external/mit/xorg/server/drivers/xf86-video-mach64/Makefile:1.6 --- src/external/mit/xorg/server/drivers/xf86-video-mach64/Makefile:1.5 Tue Dec 22 09:12:42 2009 +++ src/external/mit/xorg/server/drivers/xf86-video-mach64/Makefile Thu Aug 11 23:15:40 2011 @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.5 2009/12/22 09:12:42 nakayama Exp $ +# $NetBSD: Makefile,v 1.6 2011/08/11 23:15:40 joerg Exp $ DRIVER= xf86-video-mach64 DRIVER_NAME= mach64_drv @@ -27,4 +27,6 @@ MAN= # defined +CWARNFLAGS.clang+= -Wno-pointer-sign + .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.8 src/external/mit/xorg/server/drivers/xf86-video-mga/Makefile:1.9 --- src/external/mit/xorg/server/drivers/xf86-video-mga/Makefile:1.8 Sat May 22 23:04:01 2010 +++ src/external/mit/xorg/server/drivers/xf86-video-mga/Makefile Thu Aug 11 23:15:40 2011 @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.8 2010/05/22 23:04:01 mrg Exp $ +# $NetBSD: Makefile,v 1.9 2011/08/11 23:15:40 joerg Exp $ .include <bsd.own.mk> @@ -32,4 +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 + .include "../Makefile.xf86-driver" Index: src/external/mit/xorg/server/drivers/xf86-video-openchrome/Makefile diff -u src/external/mit/xorg/server/drivers/xf86-video-openchrome/Makefile:1.3 src/external/mit/xorg/server/drivers/xf86-video-openchrome/Makefile:1.4 --- src/external/mit/xorg/server/drivers/xf86-video-openchrome/Makefile:1.3 Fri Jul 1 01:25:52 2011 +++ src/external/mit/xorg/server/drivers/xf86-video-openchrome/Makefile Thu Aug 11 23:15:40 2011 @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.3 2011/07/01 01:25:52 mrg Exp $ +# $NetBSD: Makefile,v 1.4 2011/08/11 23:15:40 joerg Exp $ DRIVER= xf86-video-openchrome DRIVER_NAME= openchrome_drv @@ -47,3 +47,5 @@ .if defined(HAVE_GCC) COPTS.via_dri.c+= -Wno-error .endif + +CWARNFLAGS.clang+= -Wno-tautological-compare Index: src/external/mit/xorg/server/drivers/xf86-video-r128/Makefile diff -u src/external/mit/xorg/server/drivers/xf86-video-r128/Makefile:1.4 src/external/mit/xorg/server/drivers/xf86-video-r128/Makefile:1.5 --- src/external/mit/xorg/server/drivers/xf86-video-r128/Makefile:1.4 Wed Nov 10 04:08:56 2010 +++ src/external/mit/xorg/server/drivers/xf86-video-r128/Makefile Thu Aug 11 23:15:40 2011 @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.4 2010/11/10 04:08:56 macallan Exp $ +# $NetBSD: Makefile,v 1.5 2011/08/11 23:15:40 joerg Exp $ DRIVER= xf86-video-r128 DRIVER_NAME= r128_drv @@ -19,4 +19,6 @@ CPPFLAGS+= -I${DESTDIR}${X11INCDIR}/libdrm +CWARNFLAGS.clang+= -Wno-format -Wno-pointer-sign + .include "../Makefile.xf86-driver" Index: src/external/mit/xorg/server/drivers/xf86-video-s3/Makefile diff -u src/external/mit/xorg/server/drivers/xf86-video-s3/Makefile:1.9 src/external/mit/xorg/server/drivers/xf86-video-s3/Makefile:1.10 --- src/external/mit/xorg/server/drivers/xf86-video-s3/Makefile:1.9 Mon Jul 12 07:54:12 2010 +++ src/external/mit/xorg/server/drivers/xf86-video-s3/Makefile Thu Aug 11 23:15:40 2011 @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.9 2010/07/12 07:54:12 kiyohara Exp $ +# $NetBSD: Makefile,v 1.10 2011/08/11 23:15:40 joerg Exp $ DRIVER= xf86-video-s3 DRIVER_NAME= s3_drv @@ -21,4 +21,6 @@ CPPFLAGS+= -DPACKAGE_VERSION=\"${PACKAGE_VERSION}\" +CWARNFLAGS.clang+= -Wno-parentheses + .include "../Makefile.xf86-driver" Index: src/external/mit/xorg/server/drivers/xf86-video-s3virge/Makefile diff -u src/external/mit/xorg/server/drivers/xf86-video-s3virge/Makefile:1.3 src/external/mit/xorg/server/drivers/xf86-video-s3virge/Makefile:1.4 --- src/external/mit/xorg/server/drivers/xf86-video-s3virge/Makefile:1.3 Wed Jun 10 01:59:09 2009 +++ src/external/mit/xorg/server/drivers/xf86-video-s3virge/Makefile Thu Aug 11 23:15:40 2011 @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.3 2009/06/10 01:59:09 mrg Exp $ +# $NetBSD: Makefile,v 1.4 2011/08/11 23:15:40 joerg Exp $ DRIVER= xf86-video-s3virge DRIVER_NAME= s3virge_drv @@ -9,4 +9,6 @@ CPPFLAGS+= -DPACKAGE_VERSION=\"${PACKAGE_VERSION}\" +CWARNFLAGS.clang+= -Wno-parentheses + .include "../Makefile.xf86-driver" Index: src/external/mit/xorg/server/drivers/xf86-video-savage/Makefile diff -u src/external/mit/xorg/server/drivers/xf86-video-savage/Makefile:1.8 src/external/mit/xorg/server/drivers/xf86-video-savage/Makefile:1.9 --- src/external/mit/xorg/server/drivers/xf86-video-savage/Makefile:1.8 Sat May 22 23:04:02 2010 +++ src/external/mit/xorg/server/drivers/xf86-video-savage/Makefile Thu Aug 11 23:15:40 2011 @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.8 2010/05/22 23:04:02 mrg Exp $ +# $NetBSD: Makefile,v 1.9 2011/08/11 23:15:40 joerg Exp $ DRIVER= xf86-video-savage DRIVER_NAME= savage_drv @@ -26,4 +26,7 @@ CPPFLAGS.savage_driver.c= -DPACKAGE_VERSION=\"${PACKAGE_MAJOR}\" CPPFLAGS.savage_exa.c= -Wno-error # volatile -> mempcy +CWARNFLAGS.clang+= -Wno-parentheses -Wno-format \ + -Wno-constant-logical-operand + .include "../Makefile.xf86-driver" Index: src/external/mit/xorg/server/drivers/xf86-video-sis/Makefile diff -u src/external/mit/xorg/server/drivers/xf86-video-sis/Makefile:1.9 src/external/mit/xorg/server/drivers/xf86-video-sis/Makefile:1.10 --- src/external/mit/xorg/server/drivers/xf86-video-sis/Makefile:1.9 Tue Mar 15 19:54:14 2011 +++ src/external/mit/xorg/server/drivers/xf86-video-sis/Makefile Thu Aug 11 23:15:40 2011 @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.9 2011/03/15 19:54:14 plunky Exp $ +# $NetBSD: Makefile,v 1.10 2011/08/11 23:15:40 joerg Exp $ DRIVER= xf86-video-sis DRIVER_NAME= sis_drv @@ -21,4 +21,6 @@ X11MANCPP= yes +CWARNFLAGS.clang+= -Wno-parentheses + .include "../Makefile.xf86-driver" Index: src/external/mit/xorg/server/drivers/xf86-video-tdfx/Makefile diff -u src/external/mit/xorg/server/drivers/xf86-video-tdfx/Makefile:1.7 src/external/mit/xorg/server/drivers/xf86-video-tdfx/Makefile:1.8 --- src/external/mit/xorg/server/drivers/xf86-video-tdfx/Makefile:1.7 Sat May 22 23:04:02 2010 +++ src/external/mit/xorg/server/drivers/xf86-video-tdfx/Makefile Thu Aug 11 23:15:41 2011 @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.7 2010/05/22 23:04:02 mrg Exp $ +# $NetBSD: Makefile,v 1.8 2011/08/11 23:15:41 joerg Exp $ DRIVER= xf86-video-tdfx DRIVER_NAME= tdfx_drv @@ -14,4 +14,6 @@ COPTS.tdfx_driver.c= -Wno-error # XXX deprecated +CWARNFLAGS.clang+= -Wno-format -Wno-pointer-sign + .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.4 src/external/mit/xorg/server/drivers/xf86-video-trident/Makefile:1.5 --- src/external/mit/xorg/server/drivers/xf86-video-trident/Makefile:1.4 Sat May 22 07:26:18 2010 +++ src/external/mit/xorg/server/drivers/xf86-video-trident/Makefile Thu Aug 11 23:15:41 2011 @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.4 2010/05/22 07:26:18 mrg Exp $ +# $NetBSD: Makefile,v 1.5 2011/08/11 23:15:41 joerg Exp $ DRIVER= xf86-video-trident DRIVER_NAME= trident_drv @@ -13,4 +13,6 @@ COPTS.trident_driver.c= -Wno-error # XXX xf86dgastr.h +CWARNFLAGS.clang+= -Wno-return-type + .include "../Makefile.xf86-driver" Index: src/external/mit/xorg/server/drivers/xf86-video-tseng/Makefile diff -u src/external/mit/xorg/server/drivers/xf86-video-tseng/Makefile:1.3 src/external/mit/xorg/server/drivers/xf86-video-tseng/Makefile:1.4 --- src/external/mit/xorg/server/drivers/xf86-video-tseng/Makefile:1.3 Wed Jun 10 02:39:29 2009 +++ src/external/mit/xorg/server/drivers/xf86-video-tseng/Makefile Thu Aug 11 23:15:41 2011 @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.3 2009/06/10 02:39:29 mrg Exp $ +# $NetBSD: Makefile,v 1.4 2011/08/11 23:15:41 joerg Exp $ DRIVER= xf86-video-tseng DRIVER_NAME= tseng_drv @@ -9,4 +9,6 @@ CPPFLAGS+= -I${X11SRCDIR.${DRIVER}}/../include +CWARNFLAGS.clang+= -Wno-pointer-sign + .include "../Makefile.xf86-driver" Index: src/external/mit/xorg/server/xorg-server/Xi/Makefile diff -u src/external/mit/xorg/server/xorg-server/Xi/Makefile:1.3 src/external/mit/xorg/server/xorg-server/Xi/Makefile:1.4 --- src/external/mit/xorg/server/xorg-server/Xi/Makefile:1.3 Tue Nov 23 08:22:29 2010 +++ src/external/mit/xorg/server/xorg-server/Xi/Makefile Thu Aug 11 23:15:41 2011 @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.3 2010/11/23 08:22:29 mrg Exp $ +# $NetBSD: Makefile,v 1.4 2011/08/11 23:15:41 joerg Exp $ .include "../Makefile.serverlib" .include "../Makefile.servermod" @@ -36,5 +36,7 @@ -I${X11SRCDIR.xorg-server}/../include CPPFLAGS+= ${X11FLAGS.DIX} +CWARNFLAGS.clang+= -Wno-tautological-compare + .include <bsd.x11.mk> .include <bsd.lib.mk> Index: src/external/mit/xorg/server/xorg-server/dix/Makefile diff -u src/external/mit/xorg/server/xorg-server/dix/Makefile:1.10 src/external/mit/xorg/server/xorg-server/dix/Makefile:1.11 --- src/external/mit/xorg/server/xorg-server/dix/Makefile:1.10 Tue Nov 23 08:22:30 2010 +++ src/external/mit/xorg/server/xorg-server/dix/Makefile Thu Aug 11 23:15:41 2011 @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.10 2010/11/23 08:22:30 mrg Exp $ +# $NetBSD: Makefile,v 1.11 2011/08/11 23:15:41 joerg Exp $ .include "../Makefile.serverlib" .include "../Makefile.servermod" @@ -44,5 +44,7 @@ COPTS.window.c= -Wno-error COPTS.inpututils.c= -Wno-error +CWARNFLAGS.clang+= -Wno-switch-enum + .include <bsd.x11.mk> .include <bsd.lib.mk> Index: src/external/mit/xorg/server/xorg-server/hw/xfree86/ddc/Makefile diff -u src/external/mit/xorg/server/xorg-server/hw/xfree86/ddc/Makefile:1.4 src/external/mit/xorg/server/xorg-server/hw/xfree86/ddc/Makefile:1.5 --- src/external/mit/xorg/server/xorg-server/hw/xfree86/ddc/Makefile:1.4 Tue Nov 23 08:22:31 2010 +++ src/external/mit/xorg/server/xorg-server/hw/xfree86/ddc/Makefile Thu Aug 11 23:15:41 2011 @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.4 2010/11/23 08:22:31 mrg Exp $ +# $NetBSD: Makefile,v 1.5 2011/08/11 23:15:41 joerg Exp $ LIBISPRIVATE=yes @@ -18,5 +18,7 @@ -I${DESTDIR}${X11INCDIR}/pixman-1 \ -I${X11SRCDIR.xorg-server}/hw/xfree86/i2c +CWARNFLAGS.clang+= -Wno-format + .include <bsd.x11.mk> .include <bsd.lib.mk> Index: src/external/mit/xorg/server/xorg-server/hw/xfree86/int10/Makefile diff -u src/external/mit/xorg/server/xorg-server/hw/xfree86/int10/Makefile:1.7 src/external/mit/xorg/server/xorg-server/hw/xfree86/int10/Makefile:1.8 --- src/external/mit/xorg/server/xorg-server/hw/xfree86/int10/Makefile:1.7 Thu Jan 6 03:29:12 2011 +++ src/external/mit/xorg/server/xorg-server/hw/xfree86/int10/Makefile Thu Aug 11 23:15:41 2011 @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.7 2011/01/06 03:29:12 macallan Exp $ +# $NetBSD: Makefile,v 1.8 2011/08/11 23:15:41 joerg Exp $ XMODULEDIR= ${X11USRLIBDIR}/modules @@ -37,6 +37,8 @@ COPTS.xf86x86emu.c= -Wno-error # XXX? +CWARNFLAGS.clang+= -Wno-format + .include <bsd.x11.mk> LIBDIR= ${XMODULEDIR} .include <bsd.lib.mk> Index: src/external/mit/xorg/server/xorg-server/hw/xfree86/xf86config/Makefile diff -u src/external/mit/xorg/server/xorg-server/hw/xfree86/xf86config/Makefile:1.3 src/external/mit/xorg/server/xorg-server/hw/xfree86/xf86config/Makefile:1.4 --- src/external/mit/xorg/server/xorg-server/hw/xfree86/xf86config/Makefile:1.3 Thu Feb 17 23:50:19 2011 +++ src/external/mit/xorg/server/xorg-server/hw/xfree86/xf86config/Makefile Thu Aug 11 23:15:41 2011 @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.3 2011/02/17 23:50:19 jmcneill Exp $ +# $NetBSD: Makefile,v 1.4 2011/08/11 23:15:41 joerg Exp $ .include "../../../Makefile.serverlib" .include "../../../Makefile.servermod" @@ -24,6 +24,8 @@ CPPFLAGS+= ${X11FLAGS.DIX} CPPFLAGS+= -DPROJECTROOT='"${X11ROOTDIR}"' +CWARNFLAGS.clang+= -Wno-format + .include <bsd.x11.mk> LIBDIR= ${XMODULEDIR} .include <bsd.lib.mk> Index: src/external/mit/xorg/server/xorg-server/hw/xfree86/xf86modes/Makefile diff -u src/external/mit/xorg/server/xorg-server/hw/xfree86/xf86modes/Makefile:1.4 src/external/mit/xorg/server/xorg-server/hw/xfree86/xf86modes/Makefile:1.5 --- src/external/mit/xorg/server/xorg-server/hw/xfree86/xf86modes/Makefile:1.4 Tue Nov 23 08:22:34 2010 +++ src/external/mit/xorg/server/xorg-server/hw/xfree86/xf86modes/Makefile Thu Aug 11 23:15:41 2011 @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.4 2010/11/23 08:22:34 mrg Exp $ +# $NetBSD: Makefile,v 1.5 2011/08/11 23:15:41 joerg Exp $ .include "../../../Makefile.serverlib" .include "../../../Makefile.servermod" @@ -43,6 +43,8 @@ # XXX CPPFLAGS.xf86RandR12.c= -Wno-error +CWARNFLAGS.clang+= -Wno-format + .include <bsd.x11.mk> LIBDIR= ${XMODULEDIR} .include <bsd.lib.mk>