diff options
| author | bjs <bjs@pkgsrc.org> | 2008-07-28 02:12:57 +0000 |
|---|---|---|
| committer | bjs <bjs@pkgsrc.org> | 2008-07-28 02:12:57 +0000 |
| commit | 4df670e2f587ecac78f1b31321206f2969254115 (patch) | |
| tree | bdb54a54646931fc2c957e35d00b77761bc1724c | |
| parent | cffc1e1d2787ccaa37993bc8bd11ea1de037f334 (diff) | |
| download | pkgsrc-4df670e2f587ecac78f1b31321206f2969254115.tar.gz | |
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.
| -rw-r--r-- | graphics/MesaLib/Makefile | 3 | ||||
| -rw-r--r-- | graphics/MesaLib/options.mk | 9 |
2 files changed, 7 insertions, 5 deletions
diff --git a/graphics/MesaLib/Makefile b/graphics/MesaLib/Makefile index 6a77d745792..b008a793535 100644 --- a/graphics/MesaLib/Makefile +++ b/graphics/MesaLib/Makefile @@ -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 --git a/graphics/MesaLib/options.mk b/graphics/MesaLib/options.mk index b4af8459c18..4649f1a95c5 100644 --- a/graphics/MesaLib/options.mk +++ b/graphics/MesaLib/options.mk @@ -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 @@ PKG_SUGGESTED_OPTIONS+= dri .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 @@ BUILD_TARGET= pkgsrc-dri${BUILD_TARGET_SUFFIX} 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 |