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

This commit is contained in:
mrg 2016-08-20 20:22:53 +00:00
parent cd81055f70
commit e5e692211a
6 changed files with 35 additions and 25 deletions

View File

@ -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= xf86-video-nouveau
DRIVER_NAME= nouveau_drv DRIVER_NAME= nouveau_drv
@ -45,11 +45,13 @@ CPPFLAGS+= -DNV_MINOR_VERSION=${PACKAGE_MINOR}
CPPFLAGS+= -DNV_PATCHLEVEL=${PACKAGE_PATCH} CPPFLAGS+= -DNV_PATCHLEVEL=${PACKAGE_PATCH}
CPPFLAGS+= -DNV_DRIVER_DATE=${DRIVER_DATE} CPPFLAGS+= -DNV_DRIVER_DATE=${DRIVER_DATE}
# XXX
COPTS.nouveau_xv.c+= -Wno-error=discarded-qualifiers
.include "../Makefile.xf86-driver" .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" .if ${XORG_SERVER_SUBDIR} != "xorg-server.old"
CPPFLAGS+= -DHAVE_XORG_LIST CPPFLAGS+= -DHAVE_XORG_LIST
CPPFLAGS+= -DHAVE_XAA_H CPPFLAGS+= -DHAVE_XAA_H

View File

@ -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= xf86-video-openchrome
DRIVER_NAME= openchrome_drv DRIVER_NAME= openchrome_drv
@ -41,10 +41,10 @@ CPPFLAGS+= -DHAVE_CONFIG_H -I${X11SRCDIR.${DRIVER}}/../include
.include "../Makefile.xf86-driver" .include "../Makefile.xf86-driver"
# XXX # XXX
.if defined(HAVE_GCC)
COPTS.via_dri.c+= -Wno-error COPTS.via_dri.c+= -Wno-error
COPTS.via_driver.c+= -Wno-error=discarded-qualifiers .if ${HAVE_GCC} > 48
COPTS.via_lvds.c+= -Wno-error=discarded-qualifiers COPTS.via_driver.c+= ${${ACTIVE_CC} == "gcc":? -Wno-error=discarded-qualifiers :}
COPTS.via_lvds.c+= ${${ACTIVE_CC} == "gcc":? -Wno-error=discarded-qualifiers :}
.endif .endif
CWARNFLAGS.clang+= -Wno-tautological-compare CWARNFLAGS.clang+= -Wno-tautological-compare

View File

@ -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= xf86-video-siliconmotion
DRIVER_NAME= siliconmotion_drv DRIVER_NAME= siliconmotion_drv
@ -12,9 +12,11 @@ MAN= siliconmotion.4
CPPFLAGS+= -DHAVE_XMODES -DHAVE_XEXTPROTO_71 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} XORG_PKG_VER_PROG= ${DRIVER}
.include "../../../xorg-pkg-ver.mk" .include "../../../xorg-pkg-ver.mk"

View File

@ -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= xf86-video-sis
DRIVER_NAME= sis_drv DRIVER_NAME= sis_drv
@ -16,13 +16,15 @@ CPPFLAGS+= -I${DESTDIR}${X11INCDIR}/X11
CPPFLAGS+= -I${DESTDIR}${X11INCDIR}/X11/dri CPPFLAGS+= -I${DESTDIR}${X11INCDIR}/X11/dri
CPPFLAGS+= -I${DESTDIR}${X11INCDIR}/libdrm 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 X11MANCPP= yes
CWARNFLAGS.clang+= -Wno-parentheses CWARNFLAGS.clang+= -Wno-parentheses
.include "../Makefile.xf86-driver" .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

View File

@ -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= xf86-video-suncg6
DRIVER_NAME= suncg6_drv DRIVER_NAME= suncg6_drv
@ -9,7 +9,9 @@ CPPFLAGS+= ${X11FLAGS.DRI}
MAN= suncg6.4 MAN= suncg6.4
# XXX
COPTS.cg6_accel.c+= -Wno-error=discarded-qualifiers
.include "../Makefile.xf86-driver" .include "../Makefile.xf86-driver"
# XXX
.if ${HAVE_GCC} > 48
COPTS.cg6_accel.c+= ${${ACTIVE_CC} == "gcc":? -Wno-error=discarded-qualifiers :}
.endif

View File

@ -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= xf86-video-sunffb
DRIVER_NAME= sunffb_drv DRIVER_NAME= sunffb_drv
@ -21,7 +21,9 @@ CPPFLAGS+= ${X11FLAGS.DRI} -DUSE_VIS
MAN= sunffb.4 MAN= sunffb.4
# XXX
COPTS.ffb_dac.c+= -Wno-error=discarded-qualifiers
.include "../Makefile.xf86-driver" .include "../Makefile.xf86-driver"
# XXX
.if ${HAVE_GCC} > 48
COPTS.ffb_dac.c+= ${${ACTIVE_CC} == "gcc":? -Wno-error=discarded-qualifiers :}
.endif