diff options
| author | jschauma <jschauma> | 2003-07-15 23:31:21 +0000 |
|---|---|---|
| committer | jschauma <jschauma> | 2003-07-15 23:31:21 +0000 |
| commit | 13a509a6ecb7012445b27885f199a0f1b865b8d8 (patch) | |
| tree | 58657d97d9f03dd23f1118cf80319147241b6f14 /graphics/MesaLib | |
| parent | 56b45beb3d855bd1028517a4ef314d5caafd1a0d (diff) | |
| download | pkgsrc-13a509a6ecb7012445b27885f199a0f1b865b8d8.tar.gz | |
Hopefully finally get this right:
Default Mesa Version should be 3.4.2, so that people who don't care and have
GL in XF don't need to build the whole thing. If MESA_REQD is set to 5.0.1
(as, for example, by MesaDemos), require version 5.0.1 of MesaLib, gl* etc.
If libGL.so.5 is found to be present on the system, force MESA_REQD to be
5.0.1 to avoid accidental downgrades if MESA_REQD was not specified before-
hand.
Changes reviewed by tron@ (thanks!).
Diffstat (limited to 'graphics/MesaLib')
| -rw-r--r-- | graphics/MesaLib/buildlink2.mk | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/graphics/MesaLib/buildlink2.mk b/graphics/MesaLib/buildlink2.mk index 7a60178217b..e876026de0f 100644 --- a/graphics/MesaLib/buildlink2.mk +++ b/graphics/MesaLib/buildlink2.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink2.mk,v 1.13 2003/07/07 02:05:59 jschauma Exp $ +# $NetBSD: buildlink2.mk,v 1.14 2003/07/15 23:31:22 jschauma Exp $ .if !defined(MESALIB_BUILDLINK2_MK) MESALIB_BUILDLINK2_MK= # defined @@ -7,7 +7,7 @@ MESALIB_BUILDLINK2_MK= # defined MESA_REQD?= 3.4.2 -.if exists(${X11PREFIX}/lib/libGL.so.5) && empty(MESA_REQD:M5.[0-9]*) +.if exists(${LOCALBASE}/lib/libGL.so.5) && empty(MESA_REQD:M5.[0-9]*) MESA_REQD= 5.0.1 .endif @@ -16,6 +16,8 @@ BUILDLINK_PKGSRCDIR.MesaLib?= ../../graphics/MesaLib _REQUIRE_BUILTIN_MESALIB?= NO +MAKEFLAGS+= MESA_REQD="${MESA_REQD}" + # XXX should be >= 3.4.2 .if !empty(MESA_REQD:M5.[0-9]*) _IS_BUILTIN_MESALIB= 0 |