[src/trunk]: src/external/mit/xorg redo previous in a way that always works

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

details:   https://anonhg.NetBSD.org/src/rev/3cdb7063b1ee
branches:  trunk
changeset: 347293:3cdb7063b1ee
user:      mrg <mrg%NetBSD.org@localhost>
date:      Sat Aug 20 06:49:21 2016 +0000

description:
redo previous in a way that always works

diffstat:

 external/mit/xorg/lib/libdrm/Makefile                      |  6 ++----
 external/mit/xorg/server/drivers/xf86-video-i128/Makefile  |  6 ++----
 external/mit/xorg/server/drivers/xf86-video-i740/Makefile  |  6 ++----
 external/mit/xorg/server/drivers/xf86-video-nv/Makefile    |  6 ++----
 external/mit/xorg/server/drivers/xf86-video-s3/Makefile    |  6 ++----
 external/mit/xorg/server/drivers/xf86-video-tseng/Makefile |  6 ++----
 6 files changed, 12 insertions(+), 24 deletions(-)

diffs (118 lines):

diff -r 4298f362817e -r 3cdb7063b1ee external/mit/xorg/lib/libdrm/Makefile
--- a/external/mit/xorg/lib/libdrm/Makefile     Sat Aug 20 06:34:22 2016 +0000
+++ b/external/mit/xorg/lib/libdrm/Makefile     Sat Aug 20 06:49:21 2016 +0000
@@ -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 @@
 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
 
diff -r 4298f362817e -r 3cdb7063b1ee external/mit/xorg/server/drivers/xf86-video-i128/Makefile
--- a/external/mit/xorg/server/drivers/xf86-video-i128/Makefile Sat Aug 20 06:34:22 2016 +0000
+++ b/external/mit/xorg/server/drivers/xf86-video-i128/Makefile Sat Aug 20 06:49:21 2016 +0000
@@ -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+=         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"
diff -r 4298f362817e -r 3cdb7063b1ee external/mit/xorg/server/drivers/xf86-video-i740/Makefile
--- a/external/mit/xorg/server/drivers/xf86-video-i740/Makefile Sat Aug 20 06:34:22 2016 +0000
+++ b/external/mit/xorg/server/drivers/xf86-video-i740/Makefile Sat Aug 20 06:49:21 2016 +0000
@@ -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_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"
diff -r 4298f362817e -r 3cdb7063b1ee external/mit/xorg/server/drivers/xf86-video-nv/Makefile
--- a/external/mit/xorg/server/drivers/xf86-video-nv/Makefile   Sat Aug 20 06:34:22 2016 +0000
+++ b/external/mit/xorg/server/drivers/xf86-video-nv/Makefile   Sat Aug 20 06:49:21 2016 +0000
@@ -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 @@
 .endif
 
 # XXX
-.if ${ACTIVE_CC} == "gcc"
-COPTS+=        -Wno-error=cpp
-.endif
+COPTS+=                ${${ACTIVE_CC} == "gcc":? -Wno-error=cpp :}
 
 .include "../Makefile.xf86-driver"
 
diff -r 4298f362817e -r 3cdb7063b1ee external/mit/xorg/server/drivers/xf86-video-s3/Makefile
--- a/external/mit/xorg/server/drivers/xf86-video-s3/Makefile   Sat Aug 20 06:34:22 2016 +0000
+++ b/external/mit/xorg/server/drivers/xf86-video-s3/Makefile   Sat Aug 20 06:49:21 2016 +0000
@@ -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+=     -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
 
diff -r 4298f362817e -r 3cdb7063b1ee external/mit/xorg/server/drivers/xf86-video-tseng/Makefile
--- a/external/mit/xorg/server/drivers/xf86-video-tseng/Makefile        Sat Aug 20 06:34:22 2016 +0000
+++ b/external/mit/xorg/server/drivers/xf86-video-tseng/Makefile        Sat Aug 20 06:49:21 2016 +0000
@@ -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 @@
 
 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