Module Name: src
Committed By: christos
Date: Fri Dec 19 05:03:30 UTC 2014
Modified Files:
src/external/mit/xorg/lib/dri: Makefile
Log Message:
- Explain what's going on a bit better
- Fix a conditional
- Don't include bsd.lib.mk if we are not building libraries
(otherwise we end up with an empty library name that installed
bogus library files lib.a etc.)
To generate a diff of this commit:
cvs rdiff -u -r1.20 -r1.21 src/external/mit/xorg/lib/dri/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.20 src/external/mit/xorg/lib/dri/Makefile:1.21
--- src/external/mit/xorg/lib/dri/Makefile:1.20 Thu Dec 18 05:08:52 2014
+++ src/external/mit/xorg/lib/dri/Makefile Fri Dec 19 00:03:30 2014
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.20 2014/12/18 10:08:52 mrg Exp $
+# $NetBSD: Makefile,v 1.21 2014/12/19 05:03:30 christos Exp $
# Link the mesa_dri_drivers mega driver.
@@ -25,6 +25,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"
@@ -359,7 +361,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
@@ -389,6 +391,8 @@ 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
.include <bsd.lib.mk>
+.endif
