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/Mesa | |
| 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/Mesa')
| -rw-r--r-- | graphics/Mesa/Makefile.common | 14 | ||||
| -rw-r--r-- | graphics/Mesa/buildlink2.mk | 4 |
2 files changed, 14 insertions, 4 deletions
diff --git a/graphics/Mesa/Makefile.common b/graphics/Mesa/Makefile.common index 8f96452ea8a..a2a04802f21 100644 --- a/graphics/Mesa/Makefile.common +++ b/graphics/Mesa/Makefile.common @@ -1,8 +1,8 @@ -# $NetBSD: Makefile.common,v 1.15 2003/07/04 16:51:00 jschauma Exp $ +# $NetBSD: Makefile.common,v 1.16 2003/07/15 23:31:21 jschauma Exp $ # Latest is: 5.0.1 -# Default is: 5.0.1 -MESA_REQD?= 5.0.1 +# Default is: 3.4.2 +MESA_REQD?= 3.4.2 MESA_VERSION= ${MESA_REQD} DISTNAME?= MesaLib-${MESA_VERSION} @@ -19,3 +19,11 @@ LIBTOOL_OVERRIDE= ${WRKSRC}/libtool GNU_CONFIGURE?= yes CONFIGURE_ARGS+= --enable-static + +.include "../../mk/bsd.prefs.mk" + +.if exists(${LOCALBASE}/lib/libGL.so.5) && empty(MESA_REQD:M5.[0-9]*) +MESA_REQD= 5.0.1 +.endif + +MAKEFLAGS+= MESA_REQD="${MESA_REQD}" diff --git a/graphics/Mesa/buildlink2.mk b/graphics/Mesa/buildlink2.mk index 9bf970381ab..ab448ef455f 100644 --- a/graphics/Mesa/buildlink2.mk +++ b/graphics/Mesa/buildlink2.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink2.mk,v 1.3 2002/11/18 07:49:24 jlam Exp $ +# $NetBSD: buildlink2.mk,v 1.4 2003/07/15 23:31:22 jschauma Exp $ .if !defined(MESA_BUILDLINK2_MK) MESA_BUILDLINK2_MK= # defined @@ -6,6 +6,8 @@ MESA_BUILDLINK2_MK= # defined MESA_REQD?= 3.4.2 BUILDLINK_PREFIX.Mesa= ${BUILDLINK_PREFIX.MesaLib} +MAKEFLAGS+= MESA_REQD="${MESA_REQD}" + .include "../../graphics/MesaLib/buildlink2.mk" .include "../../graphics/glu/buildlink2.mk" .include "../../graphics/glut/buildlink2.mk" |