Module Name: src
Committed By: martin
Date: Tue Jan 6 11:00:40 UTC 2015
Modified Files:
src/external/mit/xorg/lib/dri [netbsd-7]: Makefile
src/external/mit/xorg/lib/gallium [netbsd-7]: Makefile
Log Message:
Pull up following revision(s) (requested by mrg in ticket #381):
external/mit/xorg/lib/dri/Makefile: revision 1.21,1.22,1.24-1.26
external/mit/xorg/lib/gallium/Makefile: revision 1.3-1.6
Fix yacc (.y->.c) handling.
Make it compile with clang.
Fix MKDEBUG handling.
To generate a diff of this commit:
cvs rdiff -u -r1.18.24.1 -r1.18.24.2 src/external/mit/xorg/lib/dri/Makefile
cvs rdiff -u -r1.6.2.2 -r1.6.2.3 src/external/mit/xorg/lib/gallium/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/dri/Makefile
diff -u src/external/mit/xorg/lib/dri/Makefile:1.18.24.1 src/external/mit/xorg/lib/dri/Makefile:1.18.24.2
--- src/external/mit/xorg/lib/dri/Makefile:1.18.24.1 Mon Jan 5 21:23:50 2015
+++ src/external/mit/xorg/lib/dri/Makefile Tue Jan 6 11:00:40 2015
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.18.24.1 2015/01/05 21:23:50 martin Exp $
+# $NetBSD: Makefile,v 1.18.24.2 2015/01/06 11:00:40 martin Exp $
# Link the mesa_dri_drivers mega driver.
@@ -26,6 +26,8 @@ CPPFLAGS+= \
#CPPFLAGS+= -D_NETBSD_SOURCE -DPTHREADS
# We don't actually build this on non-x86 at all, currently.
+# The following if statements are not effective since we only
+# get here for x86
.if ${MACHINE_ARCH} == "alpha"
DRIVERS= r200 radeon
.elif ${MACHINE} == "macppc" || ${MACHINE} == "ofppc"
@@ -360,7 +362,7 @@ MESA_SRC_MODULES= main math math_xform
.include "../libmesa.mk"
.include "../libglsl.mk"
-.if ${MACHINE} == "amd64" || ${MACHINE} == "i386"
+.if ${MACHINE_ARCH} == "i386" || ${MACHINE_ARCH} == "x86_64"
SRCS+= streaming-load-memcpy.c
CPPFLAGS.streaming-load-memcpy.c+= -msse4.1
.endif
@@ -370,7 +372,7 @@ CPPFLAGS.streaming-load-memcpy.c+= -msse
.for _d in ${DRIVERS}
SYMLINKS+= mesa_dri_drivers.so.${SHLIB_MAJOR} ${DRIDIR}/${_d}_dri.so.${SHLIB_MAJOR}
SYMLINKS+= ${_d}_dri.so.${SHLIB_MAJOR} ${DRIDIR}/${_d}_dri.so
-.if ${MKDEBUG:Uno} == "yes"
+.if ${MKDEBUG} != "no"
SYMLINKS+= mesa_dri_drivers.so.${SHLIB_MAJOR}.debug ${DRIDEBUGDIR}/${_d}_dri.so.${SHLIB_MAJOR}.debug
.endif
.endfor
@@ -393,6 +395,15 @@ FILES= drirc
.PATH: ${X11SRCDIR.MesaLib}/src/mesa/drivers/dri/common
.include <bsd.x11.mk>
+.if ${MACHINE_ARCH} == "i386" || ${MACHINE_ARCH} == "x86_64"
LIBDIR= ${X11USRLIBDIR}/modules/dri
+CWARNFLAGS.clang+= -Wno-error=initializer-overrides -Wno-error=switch \
+ -Wno-error=tautological-constant-out-of-range-compare
+
.include <bsd.lib.mk>
+.else
+.include <bsd.inc.mk>
+.endif
+# Don't re-build .c files when .y files change
+.y.c:
Index: src/external/mit/xorg/lib/gallium/Makefile
diff -u src/external/mit/xorg/lib/gallium/Makefile:1.6.2.2 src/external/mit/xorg/lib/gallium/Makefile:1.6.2.3
--- src/external/mit/xorg/lib/gallium/Makefile:1.6.2.2 Mon Jan 5 21:23:51 2015
+++ src/external/mit/xorg/lib/gallium/Makefile Tue Jan 6 11:00:40 2015
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.6.2.2 2015/01/05 21:23:51 martin Exp $
+# $NetBSD: Makefile,v 1.6.2.3 2015/01/06 11:00:40 martin Exp $
# Link the gallium mega driver.
@@ -463,15 +463,25 @@ CPPFLAGS.target.c += \
-I${X11SRCDIR.MesaLib}/src/loader \
-I${X11SRCDIR.MesaLib}/src/gallium/winsys
+CWARNFLAGS.clang+= -Wno-error=constant-conversion \
+ -Wno-error=tautological-constant-out-of-range-compare \
+ -Wno-error=pointer-sign \
+ -Wno-error=switch \
+ -Wno-error=absolute-value \
+ -Wno-error=tautological-compare \
+ -Wno-error=static-in-inline
+
.include <bsd.x11.mk>
LIBDIR= ${X11USRLIBDIR}/modules/dri
.for _d in ${DRIVERS}
SYMLINKS+= gallium_dri.so ${DRIDIR}/${_d}_dri.so
SYMLINKS+= gallium_dri.so.${SHLIB_MAJOR} ${DRIDIR}/${_d}_dri.so.${SHLIB_MAJOR}
-.if ${MKDEBUG:Uno} == "yes"
+.if ${MKDEBUG} != "no"
SYMLINKS+= gallium_dri.so.${SHLIB_MAJOR}.debug ${DRIDEBUGDIR}/${_d}_dri.so.${SHLIB_MAJOR}.debug
.endif
.endfor
.include <bsd.lib.mk>
+# Don't regenerate c files
+.y.c:
