diff options
| author | agc <agc> | 2002-11-12 20:24:39 +0000 |
|---|---|---|
| committer | agc <agc> | 2002-11-12 20:24:39 +0000 |
| commit | 27d3c1689a64e4886a81bc2be755f20cb79ddf03 (patch) | |
| tree | 3706fa7df08c3f7c5ef661933463a70367b1f876 | |
| parent | 21e525117bbf537a6cd663c0569cf68fcb040dc9 (diff) | |
| download | pkgsrc-27d3c1689a64e4886a81bc2be755f20cb79ddf03.tar.gz | |
Pullup a fix from -current pkgsrc to the netbsd-1-6 pkgsrc branch
for pkgsrc/graphics/glu/Makefile.
Requested by Manuel Bouyer.
"I discovered a problem with graphics/glu: its buildlink.mk checks if
glu is already part of base system, but not the Makefile itself, so
during a bulk build the base system libglu will be overwritten by the
package. Our base system has libglu.1 where the package installs
libglu.3, in the same place. This results in some packages having an
effective dependancy to the glu package (because of the lib majuor
number difference), which is not recorded in the package. So
installing e.g. kde2 won't pullup glu, but it won't run because of
the missing libglu.so.3 The attached patch solves this problem. The
code comes from pkgsrc-current,"
| -rw-r--r-- | graphics/glu/Makefile | 15 |
1 files changed, 14 insertions, 1 deletions
diff --git a/graphics/glu/Makefile b/graphics/glu/Makefile index d4cb8298efd..a58a429e834 100644 --- a/graphics/glu/Makefile +++ b/graphics/glu/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.10 2001/09/27 23:18:11 jlam Exp $ +# $NetBSD: Makefile,v 1.10.8.1 2002/11/12 20:24:39 agc Exp $ # .include "../Mesa/Makefile.common" @@ -24,6 +24,19 @@ LTCONFIG_OVERRIDE= ${WRKSRC}/ltconfig GNU_CONFIGURE= yes CONFIGURE_ARGS= --enable-static +.include "../../mk/bsd.prefs.mk" + +# Check if we got libGLU distributed with XFree86 4.x. +.if exists(${X11BASE}/include/GL/glu.h) +_IS_BUILTIN_GLU!= ${EGREP} -c BuildGLULibrary ${X11BASE}/lib/X11/config/X11.tmpl || ${TRUE} +.else +_IS_BUILTIN_GLU= 0 +.endif + +.if ${_IS_BUILTIN_GLU} != "0" +IGNORE= "GLU has already been installed as part of XFree86-4.x" +.endif + do-build: cd ${WRKSRC}/src-glu && ${SETENV} ${MAKE_ENV} \ ${MAKE_PROGRAM} ${MAKE_FLAGS} -f ${MAKEFILE} ${ALL_TARGET} |