[pkgsrc/trunk]: pkgsrc/graphics/MesaLib Compensate for lossage I've caused by...

[drochner <drochner%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/9bf3a5e27056
branches:  trunk
changeset: 509997:9bf3a5e27056
user:      drochner <drochner%pkgsrc.org@localhost>
date:      Tue Mar 21 19:26:31 2006 +0000

description:
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@localhost for testing and reports.

diffstat:

 graphics/MesaLib/Makefile         |  10 +++++++++-
 graphics/MesaLib/buildlink3.mk    |   6 +++++-
 graphics/MesaLib/distinfo         |   4 ++--
 graphics/MesaLib/patches/patch-ah |   4 ++--
 4 files changed, 18 insertions(+), 6 deletions(-)

diffs (78 lines):

diff -r d9e9426a7430 -r 9bf3a5e27056 graphics/MesaLib/Makefile
--- a/graphics/MesaLib/Makefile Tue Mar 21 19:24:45 2006 +0000
+++ b/graphics/MesaLib/Makefile Tue Mar 21 19:26:31 2006 +0000
@@ -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 @@
 
 .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 -r d9e9426a7430 -r 9bf3a5e27056 graphics/MesaLib/buildlink3.mk
--- a/graphics/MesaLib/buildlink3.mk    Tue Mar 21 19:24:45 2006 +0000
+++ b/graphics/MesaLib/buildlink3.mk    Tue Mar 21 19:26:31 2006 +0000
@@ -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 @@
 
 .endif # MESALIB_BUILDLINK3_MK
 
+.if !empty(MACHINE_PLATFORM:MNetBSD-[12].*)
+.include "../../devel/pthread-stublib/buildlink3.mk"
+.endif
+
 BUILDLINK_DEPTH:=      ${BUILDLINK_DEPTH:S/+$//}
diff -r d9e9426a7430 -r 9bf3a5e27056 graphics/MesaLib/distinfo
--- a/graphics/MesaLib/distinfo Tue Mar 21 19:24:45 2006 +0000
+++ b/graphics/MesaLib/distinfo Tue Mar 21 19:26:31 2006 +0000
@@ -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-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 -r d9e9426a7430 -r 9bf3a5e27056 graphics/MesaLib/patches/patch-ah
--- a/graphics/MesaLib/patches/patch-ah Tue Mar 21 19:24:45 2006 +0000
+++ b/graphics/MesaLib/patches/patch-ah Tue Mar 21 19:26:31 2006 +0000
@@ -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 @@
  # 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