[src/trunk]: src/external/mit/xorg/lib/dri - Explain what's going on a bit be...

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

details:   https://anonhg.NetBSD.org/src/rev/8ff33142b662
branches:  trunk
changeset: 805118:8ff33142b662
user:      christos <christos%NetBSD.org@localhost>
date:      Fri Dec 19 05:03:30 2014 +0000

description:
- 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.)

diffstat:

 external/mit/xorg/lib/dri/Makefile |  8 ++++++--
 1 files changed, 6 insertions(+), 2 deletions(-)

diffs (36 lines):

diff -r 062ac31187d9 -r 8ff33142b662 external/mit/xorg/lib/dri/Makefile
--- a/external/mit/xorg/lib/dri/Makefile        Fri Dec 19 04:44:13 2014 +0000
+++ b/external/mit/xorg/lib/dri/Makefile        Fri Dec 19 05:03:30 2014 +0000
@@ -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+=    -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 @@
 .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 @@
 .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