Module Name: src
Committed By: mrg
Date: Sat Aug 20 06:49:21 UTC 2016
Modified Files:
src/external/mit/xorg/lib/libdrm: Makefile
src/external/mit/xorg/server/drivers/xf86-video-i128: Makefile
src/external/mit/xorg/server/drivers/xf86-video-i740: Makefile
src/external/mit/xorg/server/drivers/xf86-video-nv: Makefile
src/external/mit/xorg/server/drivers/xf86-video-s3: Makefile
src/external/mit/xorg/server/drivers/xf86-video-tseng: Makefile
Log Message:
redo previous in a way that always works
To generate a diff of this commit:
cvs rdiff -u -r1.12 -r1.13 src/external/mit/xorg/lib/libdrm/Makefile
cvs rdiff -u -r1.4 -r1.5 \
src/external/mit/xorg/server/drivers/xf86-video-i128/Makefile
cvs rdiff -u -r1.6 -r1.7 \
src/external/mit/xorg/server/drivers/xf86-video-i740/Makefile
cvs rdiff -u -r1.9 -r1.10 \
src/external/mit/xorg/server/drivers/xf86-video-nv/Makefile
cvs rdiff -u -r1.14 -r1.15 \
src/external/mit/xorg/server/drivers/xf86-video-s3/Makefile
cvs rdiff -u -r1.6 -r1.7 \
src/external/mit/xorg/server/drivers/xf86-video-tseng/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/lib/libdrm/Makefile
diff -u src/external/mit/xorg/lib/libdrm/Makefile:1.12 src/external/mit/xorg/lib/libdrm/Makefile:1.13
--- src/external/mit/xorg/lib/libdrm/Makefile:1.12 Sat Aug 20 05:44:00 2016
+++ src/external/mit/xorg/lib/libdrm/Makefile Sat Aug 20 06:49:21 2016
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.12 2016/08/20 05:44:00 mrg Exp $
+# $NetBSD: Makefile,v 1.13 2016/08/20 06:49:21 mrg Exp $
.include <bsd.own.mk>
@@ -17,9 +17,7 @@ SUBDIR= drm kms
PKGCONFIG= libdrm
PKGDIST= ${LIB}
-.if ${ACTIVE_CC} == "gcc"
-COPTS.xf86drm.c+= -Wno-error=cpp # #warnings needing porting
-.endif
+COPTS.xf86drm.c+= ${${ACTIVE_CC} == "gcc":? -Wno-error=cpp :}
CWARNFLAGS.clang+= -Wno-conversion -Wno-tautological-compare
Index: src/external/mit/xorg/server/drivers/xf86-video-i128/Makefile
diff -u src/external/mit/xorg/server/drivers/xf86-video-i128/Makefile:1.4 src/external/mit/xorg/server/drivers/xf86-video-i128/Makefile:1.5
--- src/external/mit/xorg/server/drivers/xf86-video-i128/Makefile:1.4 Sat Aug 20 05:44:01 2016
+++ src/external/mit/xorg/server/drivers/xf86-video-i128/Makefile Sat Aug 20 06:49:21 2016
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.4 2016/08/20 05:44:01 mrg Exp $
+# $NetBSD: Makefile,v 1.5 2016/08/20 06:49:21 mrg Exp $
DRIVER= xf86-video-i128
DRIVER_NAME= i128_drv
@@ -7,8 +7,6 @@ SRCS= i128accel.c i128dga.c i128exa.c i
SRCS+= i128IBMDAC.c i128init.c
MAN= i128.4
-.if ${ACTIVE_CC} == "gcc"
-COPTS+= -Wno-error=cpp
-.endif
+COPTS+= ${${ACTIVE_CC} == "gcc":? -Wno-error=cpp :}
.include "../Makefile.xf86-driver"
Index: src/external/mit/xorg/server/drivers/xf86-video-i740/Makefile
diff -u src/external/mit/xorg/server/drivers/xf86-video-i740/Makefile:1.6 src/external/mit/xorg/server/drivers/xf86-video-i740/Makefile:1.7
--- src/external/mit/xorg/server/drivers/xf86-video-i740/Makefile:1.6 Sat Aug 20 05:44:01 2016
+++ src/external/mit/xorg/server/drivers/xf86-video-i740/Makefile Sat Aug 20 06:49:21 2016
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.6 2016/08/20 05:44:01 mrg Exp $
+# $NetBSD: Makefile,v 1.7 2016/08/20 06:49:21 mrg Exp $
DRIVER= xf86-video-i740
DRIVER_NAME= i740_drv
@@ -7,8 +7,6 @@ SRCS= i740_accel.c i740_cursor.c i740_d
SRCS+= i740_i2c.c i740_io.c i740_video.c
MAN= i740.4
-.if ${ACTIVE_CC} == "gcc"
-COPTS+= -Wno-error=cpp
-.endif
+COPTS+= ${${ACTIVE_CC} == "gcc":? -Wno-error=cpp :}
.include "../Makefile.xf86-driver"
Index: src/external/mit/xorg/server/drivers/xf86-video-nv/Makefile
diff -u src/external/mit/xorg/server/drivers/xf86-video-nv/Makefile:1.9 src/external/mit/xorg/server/drivers/xf86-video-nv/Makefile:1.10
--- src/external/mit/xorg/server/drivers/xf86-video-nv/Makefile:1.9 Sat Aug 20 05:44:01 2016
+++ src/external/mit/xorg/server/drivers/xf86-video-nv/Makefile Sat Aug 20 06:49:21 2016
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.9 2016/08/20 05:44:01 mrg Exp $
+# $NetBSD: Makefile,v 1.10 2016/08/20 06:49:21 mrg Exp $
DRIVER= xf86-video-nv
DRIVER_NAME= nv_drv
@@ -26,9 +26,7 @@ CPPFLAGS+= -DAVOID_VGAHW
.endif
# XXX
-.if ${ACTIVE_CC} == "gcc"
-COPTS+= -Wno-error=cpp
-.endif
+COPTS+= ${${ACTIVE_CC} == "gcc":? -Wno-error=cpp :}
.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.14 src/external/mit/xorg/server/drivers/xf86-video-s3/Makefile:1.15
--- src/external/mit/xorg/server/drivers/xf86-video-s3/Makefile:1.14 Sat Aug 20 05:44:01 2016
+++ src/external/mit/xorg/server/drivers/xf86-video-s3/Makefile Sat Aug 20 06:49:21 2016
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.14 2016/08/20 05:44:01 mrg Exp $
+# $NetBSD: Makefile,v 1.15 2016/08/20 06:49:21 mrg Exp $
DRIVER= xf86-video-s3
DRIVER_NAME= s3_drv
@@ -22,9 +22,7 @@ CPPFLAGS.s3_video.c+= -DS3_NEWMMIO=1 \
CPPFLAGS+= -DPACKAGE_VERSION=\"${PACKAGE_VERSION}\"
# XXX xf86PciInfo.h
-.if ${ACTIVE_CC} == "gcc"
-COPTS+= -Wno-error=cpp
-.endif
+COPTS+= ${${ACTIVE_CC} == "gcc":? -Wno-error=cpp :}
CWARNFLAGS.clang+= -Wno-parentheses
Index: src/external/mit/xorg/server/drivers/xf86-video-tseng/Makefile
diff -u src/external/mit/xorg/server/drivers/xf86-video-tseng/Makefile:1.6 src/external/mit/xorg/server/drivers/xf86-video-tseng/Makefile:1.7
--- src/external/mit/xorg/server/drivers/xf86-video-tseng/Makefile:1.6 Sat Aug 20 05:44:01 2016
+++ src/external/mit/xorg/server/drivers/xf86-video-tseng/Makefile Sat Aug 20 06:49:21 2016
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.6 2016/08/20 05:44:01 mrg Exp $
+# $NetBSD: Makefile,v 1.7 2016/08/20 06:49:21 mrg Exp $
DRIVER= xf86-video-tseng
DRIVER_NAME= tseng_drv
@@ -9,9 +9,7 @@ MAN= tseng.4
CPPFLAGS+= -I${X11SRCDIR.${DRIVER}}/../include
-.if ${ACTIVE_CC} == "gcc"
-COPTS+= -Wno-error=cpp
-.endif
+COPTS+= ${${ACTIVE_CC} == "gcc":? -Wno-error=cpp :}
CWARNFLAGS.clang+= -Wno-pointer-sign
