diff options
| author | drochner <drochner@pkgsrc.org> | 2006-03-21 19:26:31 +0000 |
|---|---|---|
| committer | drochner <drochner@pkgsrc.org> | 2006-03-21 19:26:31 +0000 |
| commit | f1baa961da424706efed8cf1cd1ca065b65c1807 (patch) | |
| tree | aec977c11df3014491ae9e59e87fbf69b59e2eb4 /graphics/MesaLib | |
| parent | ea4adc2c6aba022717b061430fd2e258f618d210 (diff) | |
| download | pkgsrc-f1baa961da424706efed8cf1cd1ca065b65c1807.tar.gz | |
Compensate for lossage I've caused by not explicitely linking against
libpthread: link against a stub lib on systems which need it (NetBSD<=2).
Thanks to mlh@goathill.org for testing and reports.
Diffstat (limited to 'graphics/MesaLib')
| -rw-r--r-- | graphics/MesaLib/Makefile | 10 | ||||
| -rw-r--r-- | graphics/MesaLib/buildlink3.mk | 6 | ||||
| -rw-r--r-- | graphics/MesaLib/distinfo | 4 | ||||
| -rw-r--r-- | graphics/MesaLib/patches/patch-ah | 4 |
4 files changed, 18 insertions, 6 deletions
diff --git a/graphics/MesaLib/Makefile b/graphics/MesaLib/Makefile index 8aa6b4bc82f..d0bf163e5e7 100644 --- a/graphics/MesaLib/Makefile +++ b/graphics/MesaLib/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.46 2006/03/02 20:19:31 drochner Exp $ +# $NetBSD: Makefile,v 1.47 2006/03/21 19:26:31 drochner Exp $ PKGNAME= MesaLib-${MESA_VERSION} PKGREVISION= 1 @@ -17,6 +17,14 @@ CONFIGURE_ARGS+= --disable-sparc .include "../../mk/pthread.buildlink3.mk" +.if !empty(MACHINE_PLATFORM:MNetBSD-[12].*) +.include "../../devel/pthread-stublib/buildlink3.mk" +PTHREAD_STUBLIB= "-L${LOCALBASE}/lib -Wl,-R${LOCALBASE}/lib -lpthstub" +.else +PTHREAD_STUBLIB= # provided by libc +.endif +BUILD_ENV+= PTHREAD_STUBLIB=${PTHREAD_STUBLIB} + pre-build: cd ${WRKSRC} && ${RM} -fr src/glu src/glut progs diff --git a/graphics/MesaLib/buildlink3.mk b/graphics/MesaLib/buildlink3.mk index 7a31c7251b7..d36eb3fe8f6 100644 --- a/graphics/MesaLib/buildlink3.mk +++ b/graphics/MesaLib/buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink3.mk,v 1.31 2006/02/05 23:09:27 joerg Exp $ +# $NetBSD: buildlink3.mk,v 1.32 2006/03/21 19:26:31 drochner Exp $ BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ MESALIB_BUILDLINK3_MK:= ${MESALIB_BUILDLINK3_MK}+ @@ -23,4 +23,8 @@ BUILDLINK_TRANSFORM+= l:MesaGL:GL .endif # MESALIB_BUILDLINK3_MK +.if !empty(MACHINE_PLATFORM:MNetBSD-[12].*) +.include "../../devel/pthread-stublib/buildlink3.mk" +.endif + BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} diff --git a/graphics/MesaLib/distinfo b/graphics/MesaLib/distinfo index 155751db379..83b3e8eed46 100644 --- a/graphics/MesaLib/distinfo +++ b/graphics/MesaLib/distinfo @@ -1,4 +1,4 @@ -$NetBSD: distinfo,v 1.38 2006/03/02 20:19:31 drochner Exp $ +$NetBSD: distinfo,v 1.39 2006/03/21 19:26:31 drochner Exp $ SHA1 (Mesa-6.4.2/MesaLib-6.4.2.tar.bz2) = 4f042bdf38c9eb62e04660bd18566e7ca50d8640 RMD160 (Mesa-6.4.2/MesaLib-6.4.2.tar.bz2) = 6bf1afc0d3bd3f5e3b5c1a019838f40603446509 @@ -16,7 +16,7 @@ SHA1 (patch-ad) = e926180243a180bc80b0332f2bcacc14b7c1f13b SHA1 (patch-ae) = c7dd8f4b9db5241acdd0f850162b8b4116cd93bd SHA1 (patch-af) = 323ceab5653127cf233e66311a947c6718edb14c SHA1 (patch-ag) = 722234c02093e0d3b10659fa83bb14c7f2e7a8ac -SHA1 (patch-ah) = f7939e25c786128ded9b804276b7ade22f0edaac +SHA1 (patch-ah) = 94faa48a6945aa6e7a0fc8806129a463d99d4338 SHA1 (patch-ai) = 3c5e4cc1e054514111d50c1d01257f4647b14558 SHA1 (patch-aj) = a805947e1aaf73a798fd3a8c6e39bf1bd62afc3a SHA1 (patch-al) = 8ccbc370bc52882ee72ba76b72a99f163f7b89a7 diff --git a/graphics/MesaLib/patches/patch-ah b/graphics/MesaLib/patches/patch-ah index 874754493b1..0f696ae88c8 100644 --- a/graphics/MesaLib/patches/patch-ah +++ b/graphics/MesaLib/patches/patch-ah @@ -1,4 +1,4 @@ -$NetBSD: patch-ah,v 1.4 2006/03/02 20:19:32 drochner Exp $ +$NetBSD: patch-ah,v 1.5 2006/03/21 19:26:32 drochner Exp $ --- configs/default.orig 2005-10-25 01:35:14.000000000 +0200 +++ configs/default @@ -27,7 +27,7 @@ $NetBSD: patch-ah,v 1.4 2006/03/02 20:19:32 drochner Exp $ # Library/program dependencies EXTRA_LIB_PATH ?= -GL_LIB_DEPS = $(EXTRA_LIB_PATH) -lX11 -lXext -lm -lpthread -+GL_LIB_DEPS = $(EXTRA_LIB_PATH) -lX11 -lXext -lm ++GL_LIB_DEPS = $(EXTRA_LIB_PATH) -lX11 -lXext -lm ${PTHREAD_STUBLIB} OSMESA_LIB_DEPS = -L$(LIB_DIR) -l$(GL_LIB) GLU_LIB_DEPS = -L$(LIB_DIR) -l$(GL_LIB) -lm GLUT_LIB_DEPS = -L$(LIB_DIR) -l$(GLU_LIB) -l$(GL_LIB) $(EXTRA_LIB_PATH) -lX11 -lXmu -lXt -lXi -lm |