Module Name: src
Committed By: mrg
Date: Sat Aug 20 20:22:54 UTC 2016
Modified Files:
src/external/mit/xorg/server/drivers/xf86-video-nouveau: Makefile
src/external/mit/xorg/server/drivers/xf86-video-openchrome: Makefile
src/external/mit/xorg/server/drivers/xf86-video-siliconmotion: Makefile
src/external/mit/xorg/server/drivers/xf86-video-sis: Makefile
src/external/mit/xorg/server/drivers/xf86-video-suncg6: Makefile
src/external/mit/xorg/server/drivers/xf86-video-sunffb: Makefile
Log Message:
apply -Wno-error=discarded-qualifiers only with GCC > 4.
To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 \
src/external/mit/xorg/server/drivers/xf86-video-nouveau/Makefile
cvs rdiff -u -r1.8 -r1.9 \
src/external/mit/xorg/server/drivers/xf86-video-openchrome/Makefile
cvs rdiff -u -r1.8 -r1.9 \
src/external/mit/xorg/server/drivers/xf86-video-siliconmotion/Makefile
cvs rdiff -u -r1.12 -r1.13 \
src/external/mit/xorg/server/drivers/xf86-video-sis/Makefile
cvs rdiff -u -r1.6 -r1.7 \
src/external/mit/xorg/server/drivers/xf86-video-suncg6/Makefile
cvs rdiff -u -r1.8 -r1.9 \
src/external/mit/xorg/server/drivers/xf86-video-sunffb/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/server/drivers/xf86-video-nouveau/Makefile
diff -u src/external/mit/xorg/server/drivers/xf86-video-nouveau/Makefile:1.2 src/external/mit/xorg/server/drivers/xf86-video-nouveau/Makefile:1.3
--- src/external/mit/xorg/server/drivers/xf86-video-nouveau/Makefile:1.2 Mon Aug 15 17:01:25 2016
+++ src/external/mit/xorg/server/drivers/xf86-video-nouveau/Makefile Sat Aug 20 20:22:53 2016
@@ -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,11 +45,13 @@ CPPFLAGS+= -DNV_MINOR_VERSION=${PACKAGE_
CPPFLAGS+= -DNV_PATCHLEVEL=${PACKAGE_PATCH}
CPPFLAGS+= -DNV_DRIVER_DATE=${DRIVER_DATE}
-# XXX
-COPTS.nouveau_xv.c+= -Wno-error=discarded-qualifiers
-
.include "../Makefile.xf86-driver"
+# XXX
+.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
CPPFLAGS+= -DHAVE_XAA_H
Index: src/external/mit/xorg/server/drivers/xf86-video-openchrome/Makefile
diff -u src/external/mit/xorg/server/drivers/xf86-video-openchrome/Makefile:1.8 src/external/mit/xorg/server/drivers/xf86-video-openchrome/Makefile:1.9
--- src/external/mit/xorg/server/drivers/xf86-video-openchrome/Makefile:1.8 Fri Aug 19 23:51:44 2016
+++ src/external/mit/xorg/server/drivers/xf86-video-openchrome/Makefile Sat Aug 20 20:22:53 2016
@@ -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 @@ CPPFLAGS+= -DHAVE_CONFIG_H -I${X11SRCDIR
.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
Index: src/external/mit/xorg/server/drivers/xf86-video-siliconmotion/Makefile
diff -u src/external/mit/xorg/server/drivers/xf86-video-siliconmotion/Makefile:1.8 src/external/mit/xorg/server/drivers/xf86-video-siliconmotion/Makefile:1.9
--- src/external/mit/xorg/server/drivers/xf86-video-siliconmotion/Makefile:1.8 Tue Aug 16 07:10:01 2016
+++ src/external/mit/xorg/server/drivers/xf86-video-siliconmotion/Makefile Sat Aug 20 20:22:53 2016
@@ -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 @@ MAN= siliconmotion.4
CPPFLAGS+= -DHAVE_XMODES -DHAVE_XEXTPROTO_71
-COPTS.smi_video.c+= -Wno-error=discarded-qualifiers
-
.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"
Index: src/external/mit/xorg/server/drivers/xf86-video-sis/Makefile
diff -u src/external/mit/xorg/server/drivers/xf86-video-sis/Makefile:1.12 src/external/mit/xorg/server/drivers/xf86-video-sis/Makefile:1.13
--- src/external/mit/xorg/server/drivers/xf86-video-sis/Makefile:1.12 Tue Aug 16 08:37:47 2016
+++ src/external/mit/xorg/server/drivers/xf86-video-sis/Makefile Sat Aug 20 20:22:54 2016
@@ -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
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
Index: src/external/mit/xorg/server/drivers/xf86-video-suncg6/Makefile
diff -u src/external/mit/xorg/server/drivers/xf86-video-suncg6/Makefile:1.6 src/external/mit/xorg/server/drivers/xf86-video-suncg6/Makefile:1.7
--- src/external/mit/xorg/server/drivers/xf86-video-suncg6/Makefile:1.6 Fri Aug 19 19:10:54 2016
+++ src/external/mit/xorg/server/drivers/xf86-video-suncg6/Makefile Sat Aug 20 20:22:54 2016
@@ -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 @@ CPPFLAGS+= ${X11FLAGS.DRI}
MAN= suncg6.4
-# XXX
-COPTS.cg6_accel.c+= -Wno-error=discarded-qualifiers
-
.include "../Makefile.xf86-driver"
+
+# XXX
+.if ${HAVE_GCC} > 48
+COPTS.cg6_accel.c+= ${${ACTIVE_CC} == "gcc":? -Wno-error=discarded-qualifiers :}
+.endif
Index: src/external/mit/xorg/server/drivers/xf86-video-sunffb/Makefile
diff -u src/external/mit/xorg/server/drivers/xf86-video-sunffb/Makefile:1.8 src/external/mit/xorg/server/drivers/xf86-video-sunffb/Makefile:1.9
--- src/external/mit/xorg/server/drivers/xf86-video-sunffb/Makefile:1.8 Fri Aug 19 19:10:54 2016
+++ src/external/mit/xorg/server/drivers/xf86-video-sunffb/Makefile Sat Aug 20 20:22:54 2016
@@ -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 @@ CPPFLAGS+= ${X11FLAGS.DRI} -DUSE_VIS
MAN= sunffb.4
-# XXX
-COPTS.ffb_dac.c+= -Wno-error=discarded-qualifiers
-
.include "../Makefile.xf86-driver"
+
+# XXX
+.if ${HAVE_GCC} > 48
+COPTS.ffb_dac.c+= ${${ACTIVE_CC} == "gcc":? -Wno-error=discarded-qualifiers :}
+.endif
