Module Name: src
Committed By: joerg
Date: Sun Jul 13 16:35:49 UTC 2014
Modified Files:
src/external/mit/xorg/bin/xauth: Makefile
src/external/mit/xorg/lib/dri/i965: Makefile
src/external/mit/xorg/lib/dri/libmesa: Makefile
src/external/mit/xorg/lib/dri/r600: Makefile
src/external/mit/xorg/lib/libGLU: Makefile
src/external/mit/xorg/lib/libOSMesa: Makefile
src/external/mit/xorg/lib/libdrm_radeon: Makefile
Log Message:
Disable more warnings for clang build to deal with xsrc changes.
To generate a diff of this commit:
cvs rdiff -u -r1.4 -r1.5 src/external/mit/xorg/bin/xauth/Makefile
cvs rdiff -u -r1.15 -r1.16 src/external/mit/xorg/lib/dri/i965/Makefile
cvs rdiff -u -r1.12 -r1.13 src/external/mit/xorg/lib/dri/libmesa/Makefile
cvs rdiff -u -r1.5 -r1.6 src/external/mit/xorg/lib/dri/r600/Makefile
cvs rdiff -u -r1.13 -r1.14 src/external/mit/xorg/lib/libGLU/Makefile
cvs rdiff -u -r1.8 -r1.9 src/external/mit/xorg/lib/libOSMesa/Makefile
cvs rdiff -u -r1.6 -r1.7 src/external/mit/xorg/lib/libdrm_radeon/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/xauth/Makefile
diff -u src/external/mit/xorg/bin/xauth/Makefile:1.4 src/external/mit/xorg/bin/xauth/Makefile:1.5
--- src/external/mit/xorg/bin/xauth/Makefile:1.4 Sat Apr 5 17:01:55 2014
+++ src/external/mit/xorg/bin/xauth/Makefile Sun Jul 13 16:35:49 2014
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.4 2014/04/05 17:01:55 tron Exp $
+# $NetBSD: Makefile,v 1.5 2014/07/13 16:35:49 joerg Exp $
.include <bsd.own.mk>
@@ -9,6 +9,8 @@ CPPFLAGS+= -DRETSIGTYPE=void -DPACKAGE_
CPPFLAGS.gethost.c= ${X11FLAGS.CONNECTION}
CPPFLAGS.parsedpy.c= ${X11FLAGS.CONNECTION}
+CWARNFLAGS.clang= -Wno-empty-body
+
LDADD+= -lXau -lXmuu -lXt -lSM -lICE -lXext -lX11
DPADD+= ${LIBXAU} ${LIBXMUU} ${LIBXT} ${LIBSM} ${LIBICE} ${LIBXEXT} ${LIBX11}
Index: src/external/mit/xorg/lib/dri/i965/Makefile
diff -u src/external/mit/xorg/lib/dri/i965/Makefile:1.15 src/external/mit/xorg/lib/dri/i965/Makefile:1.16
--- src/external/mit/xorg/lib/dri/i965/Makefile:1.15 Wed Jul 9 20:22:55 2014
+++ src/external/mit/xorg/lib/dri/i965/Makefile Sun Jul 13 16:35:49 2014
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.15 2014/07/09 20:22:55 riastradh Exp $
+# $NetBSD: Makefile,v 1.16 2014/07/13 16:35:49 joerg Exp $
MODULE= i965
@@ -124,7 +124,7 @@ SRCS+= \
brw_fs_vector_splitting.cpp \
brw_shader.cpp
-CWARNFLAGS.clang+= -Wno-format -Wno-switch
+CWARNFLAGS.clang+= -Wno-format -Wno-switch -Wno-tautological-compare
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.12 src/external/mit/xorg/lib/dri/libmesa/Makefile:1.13
--- src/external/mit/xorg/lib/dri/libmesa/Makefile:1.12 Wed Jul 9 20:22:55 2014
+++ src/external/mit/xorg/lib/dri/libmesa/Makefile Sun Jul 13 16:35:49 2014
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.12 2014/07/09 20:22:55 riastradh Exp $
+# $NetBSD: Makefile,v 1.13 2014/07/13 16:35:49 joerg Exp $
.include <bsd.own.mk>
@@ -34,6 +34,7 @@ LIBDIR= ${X11USRLIBDIR}/modules/dri
#LIBDPLIBS+= GL ${.CURDIR}/../../libGL
-CWARNFLAGS.clang+= -Wno-format -Wno-constant-conversion
+CWARNFLAGS.clang+= -Wno-format -Wno-constant-conversion \
+ -Wno-tautological-compare
.include <bsd.lib.mk>
Index: src/external/mit/xorg/lib/dri/r600/Makefile
diff -u src/external/mit/xorg/lib/dri/r600/Makefile:1.5 src/external/mit/xorg/lib/dri/r600/Makefile:1.6
--- src/external/mit/xorg/lib/dri/r600/Makefile:1.5 Wed Jul 9 20:22:55 2014
+++ src/external/mit/xorg/lib/dri/r600/Makefile Sun Jul 13 16:35:49 2014
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.5 2014/07/09 20:22:55 riastradh Exp $
+# $NetBSD: Makefile,v 1.6 2014/07/13 16:35:49 joerg Exp $
MODULE= r600
@@ -56,6 +56,6 @@ SRCS+= \
LIBDPLIBS+= drm_radeon ${.CURDIR}/../../libdrm_radeon
CWARNFLAGS.clang+= -Wno-constant-logical-operand -Wno-empty-body \
- -Wno-format
+ -Wno-format -Wno-tautological-compare
.include "${.CURDIR}/../dri.mk"
Index: src/external/mit/xorg/lib/libGLU/Makefile
diff -u src/external/mit/xorg/lib/libGLU/Makefile:1.13 src/external/mit/xorg/lib/libGLU/Makefile:1.14
--- src/external/mit/xorg/lib/libGLU/Makefile:1.13 Sat Jun 14 20:49:37 2014
+++ src/external/mit/xorg/lib/libGLU/Makefile Sun Jul 13 16:35:49 2014
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.13 2014/06/14 20:49:37 mrg Exp $
+# $NetBSD: Makefile,v 1.14 2014/07/13 16:35:49 joerg Exp $
NOLINT= 1 # XTODO: tess.ln SIGSEGVs lint :(
@@ -97,4 +97,4 @@ COPTS.tobezier.cc+= -Wno-error
COPTS.sampleCompTop.cc+= -O0
.endif
-CWARNFLAGS.clang+= -Wno-parentheses
+CWARNFLAGS.clang+= -Wno-parentheses -Wno-tautological-undefined-compare
Index: src/external/mit/xorg/lib/libOSMesa/Makefile
diff -u src/external/mit/xorg/lib/libOSMesa/Makefile:1.8 src/external/mit/xorg/lib/libOSMesa/Makefile:1.9
--- src/external/mit/xorg/lib/libOSMesa/Makefile:1.8 Wed Jul 9 20:22:56 2014
+++ src/external/mit/xorg/lib/libOSMesa/Makefile Sun Jul 13 16:35:49 2014
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.8 2014/07/09 20:22:56 riastradh Exp $
+# $NetBSD: Makefile,v 1.9 2014/07/13 16:35:49 joerg Exp $
.include <bsd.own.mk>
@@ -15,7 +15,7 @@ CPPFLAGS+= ${X11FLAGS.THREADLIB} \
-D_NETBSD_SOURCE -DUSE_EXTERNAL_DXTN_LIB=1 -DHAVE_ALIAS
CFLAGS+= -pthread
-CWARNFLAGS.clang+= -Wno-format -Wno-constant-conversion
+CWARNFLAGS.clang+= -Wno-format -Wno-constant-conversion -Wno-tautological-compare
.include "libmesa.mk"
Index: src/external/mit/xorg/lib/libdrm_radeon/Makefile
diff -u src/external/mit/xorg/lib/libdrm_radeon/Makefile:1.6 src/external/mit/xorg/lib/libdrm_radeon/Makefile:1.7
--- src/external/mit/xorg/lib/libdrm_radeon/Makefile:1.6 Wed Jul 9 20:22:56 2014
+++ src/external/mit/xorg/lib/libdrm_radeon/Makefile Sun Jul 13 16:35:49 2014
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.6 2014/07/09 20:22:56 riastradh Exp $
+# $NetBSD: Makefile,v 1.7 2014/07/13 16:35:49 joerg Exp $
.include <bsd.own.mk>
@@ -17,6 +17,8 @@ SRCS= radeon_bo.c \
CPPFLAGS+= -I${DESTDIR}${X11INCDIR}/libdrm
CPPFLAGS+= -I${DESTDIR}${X11INCDIR}/X11 -I${X11SRCDIR.drm}
+CWARNFLAGS.clang+= -Wno-pointer-sign -Wno-parentheses-equality
+
LIBDPLIBS= drm ${.CURDIR}/../libdrm
PKGCONFIG= libdrm_radeon
