[src/trunk]: src/external/mit/xorg/server/drivers apply -Wno-error=discarded-...

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

details:   https://anonhg.NetBSD.org/src/rev/7b5c171a4bb7
branches:  trunk
changeset: 347324:7b5c171a4bb7
user:      mrg <mrg%NetBSD.org@localhost>
date:      Sat Aug 20 20:22:53 2016 +0000

description:
apply -Wno-error=discarded-qualifiers only with GCC > 4.

diffstat:

 external/mit/xorg/server/drivers/xf86-video-nouveau/Makefile       |  10 ++++--
 external/mit/xorg/server/drivers/xf86-video-openchrome/Makefile    |   8 ++--
 external/mit/xorg/server/drivers/xf86-video-siliconmotion/Makefile |   8 +++--
 external/mit/xorg/server/drivers/xf86-video-sis/Makefile           |  14 +++++----
 external/mit/xorg/server/drivers/xf86-video-suncg6/Makefile        |  10 ++++--
 external/mit/xorg/server/drivers/xf86-video-sunffb/Makefile        |  10 ++++--
 6 files changed, 35 insertions(+), 25 deletions(-)

diffs (145 lines):

diff -r 6109b4a9d0f5 -r 7b5c171a4bb7 external/mit/xorg/server/drivers/xf86-video-nouveau/Makefile
--- a/external/mit/xorg/server/drivers/xf86-video-nouveau/Makefile      Sat Aug 20 20:19:08 2016 +0000
+++ b/external/mit/xorg/server/drivers/xf86-video-nouveau/Makefile      Sat Aug 20 20:22:53 2016 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: Makefile,v 1.2 2016/08/15 17:01:25 mrg Exp $
+#      $NetBSD: Makefile,v 1.3 2016/08/20 20:22:53 mrg Exp $
 
 DRIVER=                xf86-video-nouveau
 DRIVER_NAME=   nouveau_drv
@@ -45,10 +45,12 @@
 CPPFLAGS+=     -DNV_PATCHLEVEL=${PACKAGE_PATCH}
 CPPFLAGS+=     -DNV_DRIVER_DATE=${DRIVER_DATE}
 
+.include "../Makefile.xf86-driver"
+
 # XXX
-COPTS.nouveau_xv.c+=   -Wno-error=discarded-qualifiers
-
-.include "../Makefile.xf86-driver"
+.if ${HAVE_GCC} > 48
+COPTS.nouveau_xv.c+=   ${${ACTIVE_CC} == "gcc":? -Wno-error=discarded-qualifiers :}
+.endif
 
 .if ${XORG_SERVER_SUBDIR} != "xorg-server.old"
 CPPFLAGS+=     -DHAVE_XORG_LIST
diff -r 6109b4a9d0f5 -r 7b5c171a4bb7 external/mit/xorg/server/drivers/xf86-video-openchrome/Makefile
--- a/external/mit/xorg/server/drivers/xf86-video-openchrome/Makefile   Sat Aug 20 20:19:08 2016 +0000
+++ b/external/mit/xorg/server/drivers/xf86-video-openchrome/Makefile   Sat Aug 20 20:22:53 2016 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: Makefile,v 1.8 2016/08/19 23:51:44 mrg Exp $
+#      $NetBSD: Makefile,v 1.9 2016/08/20 20:22:53 mrg Exp $
 
 DRIVER=                xf86-video-openchrome
 DRIVER_NAME=   openchrome_drv
@@ -41,10 +41,10 @@
 .include "../Makefile.xf86-driver"
 
 # XXX
-.if defined(HAVE_GCC)
 COPTS.via_dri.c+= -Wno-error
-COPTS.via_driver.c+= -Wno-error=discarded-qualifiers
-COPTS.via_lvds.c+= -Wno-error=discarded-qualifiers
+.if ${HAVE_GCC} > 48
+COPTS.via_driver.c+=   ${${ACTIVE_CC} == "gcc":? -Wno-error=discarded-qualifiers :}
+COPTS.via_lvds.c+=     ${${ACTIVE_CC} == "gcc":? -Wno-error=discarded-qualifiers :}
 .endif
 
 CWARNFLAGS.clang+=     -Wno-tautological-compare
diff -r 6109b4a9d0f5 -r 7b5c171a4bb7 external/mit/xorg/server/drivers/xf86-video-siliconmotion/Makefile
--- a/external/mit/xorg/server/drivers/xf86-video-siliconmotion/Makefile        Sat Aug 20 20:19:08 2016 +0000
+++ b/external/mit/xorg/server/drivers/xf86-video-siliconmotion/Makefile        Sat Aug 20 20:22:53 2016 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: Makefile,v 1.8 2016/08/16 07:10:01 mrg Exp $
+#      $NetBSD: Makefile,v 1.9 2016/08/20 20:22:53 mrg Exp $
 
 DRIVER=                xf86-video-siliconmotion
 DRIVER_NAME=   siliconmotion_drv
@@ -12,9 +12,11 @@
 
 CPPFLAGS+=     -DHAVE_XMODES -DHAVE_XEXTPROTO_71
 
-COPTS.smi_video.c+=    -Wno-error=discarded-qualifiers
+.include "../Makefile.xf86-driver"
 
-.include "../Makefile.xf86-driver"
+.if ${HAVE_GCC} > 48
+COPTS.smi_video.c+=    ${${ACTIVE_CC} == "gcc":? -Wno-error=discarded-qualifiers :}
+.endif
 
 XORG_PKG_VER_PROG=     ${DRIVER}
 .include "../../../xorg-pkg-ver.mk"
diff -r 6109b4a9d0f5 -r 7b5c171a4bb7 external/mit/xorg/server/drivers/xf86-video-sis/Makefile
--- a/external/mit/xorg/server/drivers/xf86-video-sis/Makefile  Sat Aug 20 20:19:08 2016 +0000
+++ b/external/mit/xorg/server/drivers/xf86-video-sis/Makefile  Sat Aug 20 20:22:53 2016 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: Makefile,v 1.12 2016/08/16 08:37:47 mrg Exp $
+#      $NetBSD: Makefile,v 1.13 2016/08/20 20:22:54 mrg Exp $
 
 DRIVER=                xf86-video-sis
 DRIVER_NAME=   sis_drv
@@ -16,13 +16,15 @@
 CPPFLAGS+=     -I${DESTDIR}${X11INCDIR}/X11/dri
 CPPFLAGS+=     -I${DESTDIR}${X11INCDIR}/libdrm
 
-# XXX
-COPTS.sis_driver.c+=   -Wno-error=discarded-qualifiers
-COPTS.sis_utility.c+=  -Wno-error=discarded-qualifiers
-COPTS.initextx.c+=     -Wno-error=discarded-qualifiers
-
 X11MANCPP=             yes
 
 CWARNFLAGS.clang+=     -Wno-parentheses
 
 .include "../Makefile.xf86-driver"
+
+# XXX
+.if ${HAVE_GCC} > 48
+COPTS.sis_driver.c+=   ${${ACTIVE_CC} == "gcc":? -Wno-error=discarded-qualifiers :}
+COPTS.sis_utility.c+=  ${${ACTIVE_CC} == "gcc":? -Wno-error=discarded-qualifiers :}
+COPTS.initextx.c+=     ${${ACTIVE_CC} == "gcc":? -Wno-error=discarded-qualifiers :}
+.endif
diff -r 6109b4a9d0f5 -r 7b5c171a4bb7 external/mit/xorg/server/drivers/xf86-video-suncg6/Makefile
--- a/external/mit/xorg/server/drivers/xf86-video-suncg6/Makefile       Sat Aug 20 20:19:08 2016 +0000
+++ b/external/mit/xorg/server/drivers/xf86-video-suncg6/Makefile       Sat Aug 20 20:22:53 2016 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: Makefile,v 1.6 2016/08/19 19:10:54 mrg Exp $
+#      $NetBSD: Makefile,v 1.7 2016/08/20 20:22:54 mrg Exp $
 
 DRIVER=                xf86-video-suncg6
 DRIVER_NAME=   suncg6_drv
@@ -9,7 +9,9 @@
 
 MAN=           suncg6.4
 
+.include "../Makefile.xf86-driver"
+
 # XXX
-COPTS.cg6_accel.c+=    -Wno-error=discarded-qualifiers
-
-.include "../Makefile.xf86-driver"
+.if ${HAVE_GCC} > 48
+COPTS.cg6_accel.c+=    ${${ACTIVE_CC} == "gcc":? -Wno-error=discarded-qualifiers :}
+.endif
diff -r 6109b4a9d0f5 -r 7b5c171a4bb7 external/mit/xorg/server/drivers/xf86-video-sunffb/Makefile
--- a/external/mit/xorg/server/drivers/xf86-video-sunffb/Makefile       Sat Aug 20 20:19:08 2016 +0000
+++ b/external/mit/xorg/server/drivers/xf86-video-sunffb/Makefile       Sat Aug 20 20:22:53 2016 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: Makefile,v 1.8 2016/08/19 19:10:54 mrg Exp $
+#      $NetBSD: Makefile,v 1.9 2016/08/20 20:22:54 mrg Exp $
 
 DRIVER=                xf86-video-sunffb
 DRIVER_NAME=   sunffb_drv
@@ -21,7 +21,9 @@
 
 MAN=           sunffb.4
 
+.include "../Makefile.xf86-driver"
+
 # XXX
-COPTS.ffb_dac.c+=      -Wno-error=discarded-qualifiers
-
-.include "../Makefile.xf86-driver"
+.if ${HAVE_GCC} > 48
+COPTS.ffb_dac.c+=      ${${ACTIVE_CC} == "gcc":? -Wno-error=discarded-qualifiers :}
+.endif