[pkgsrc/trunk]: pkgsrc/graphics/MesaLib Change options.mk to build plain 'pkg...

[bjs <bjs%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/a951f983c25f
branches:  trunk
changeset: 545190:a951f983c25f
user:      bjs <bjs%pkgsrc.org@localhost>
date:      Mon Jul 28 02:12:57 2008 +0000

description:
Change options.mk to build plain 'pkgsrc' target for libOSMesa.
The assembler dispatch code is only for indirect or direct
rendering, anyway--I apologize for not noticing this sooner.

This should fix the recent non-dri build problems people were having.

Thanks to Matthias Scheler and others for reporting this problem to me.

NOTE: Direct/indirect rendering support is still default for i386
and amd64 on NetBSD 4+, but only if you're using modular Xorg.

diffstat:

 graphics/MesaLib/Makefile   |  3 ++-
 graphics/MesaLib/options.mk |  9 +++++----
 2 files changed, 7 insertions(+), 5 deletions(-)

diffs (43 lines):

diff -r 5a893784a35d -r a951f983c25f graphics/MesaLib/Makefile
--- a/graphics/MesaLib/Makefile Sun Jul 27 22:59:38 2008 +0000
+++ b/graphics/MesaLib/Makefile Mon Jul 28 02:12:57 2008 +0000
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.65 2008/07/27 00:03:42 bjs Exp $
+# $NetBSD: Makefile,v 1.66 2008/07/28 02:12:57 bjs Exp $
 
 PKGNAME=       MesaLib-${MESA_PKGVERSION}
 COMMENT=       Graphics library similar to SGI's OpenGL
+PKGREVISION=   1
 
 MESA_HEADERS=  gl.h gl_mangle.h glext.h glx.h glxext.h \
                glx_mangle.h osmesa.h xmesa.h xmesa_x.h \
diff -r 5a893784a35d -r a951f983c25f graphics/MesaLib/options.mk
--- a/graphics/MesaLib/options.mk       Sun Jul 27 22:59:38 2008 +0000
+++ b/graphics/MesaLib/options.mk       Mon Jul 28 02:12:57 2008 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: options.mk,v 1.10 2008/07/27 00:03:42 bjs Exp $
+# $NetBSD: options.mk,v 1.11 2008/07/28 02:12:57 bjs Exp $
 
 PKG_OPTIONS_VAR=       PKG_OPTIONS.MesaLib
 
@@ -35,8 +35,9 @@
 .include "../../mk/bsd.options.mk"
 ###
 ### XXX Yes, this is a bit overly verbose; with Mesa, that can't hurt much.
-###
-.if !empty(PKG_OPTIONS:Mi386) || !empty(PKG_OPTIONS:Mx86_64)
+###    NOTE: there is no assembler code built with libOSMesa.
+.if (!empty(PKG_OPTIONS:Mi386) || !empty(PKG_OPTIONS:Mx86_64)) && \
+     !empty(PKG_OPTIONS:Mdri)
 BUILD_TARGET_SUFFIX=   -${MACHINE_ARCH}
 .else
 BUILD_TARGET_SUFFIX=   # empty
@@ -47,7 +48,7 @@
 PLIST.dri=     # empty
 .  include "../../graphics/MesaLib/dri.mk"
 .else
-BUILD_TARGET=  pkgsrc${BUILD_TARGET_SUFFIX}
+BUILD_TARGET=  pkgsrc
 PLIST.nodri=   # empty
 ###
 ### XXX building libOSMesa breaks with -j, and GNU make has no .WAIT