diff options
| author | tron <tron> | 1999-05-02 19:46:16 +0000 |
|---|---|---|
| committer | tron <tron> | 1999-05-02 19:46:16 +0000 |
| commit | 6d96738b51df969cbafbd852c4390ab76a10735c (patch) | |
| tree | bb6e7130b300c6814b1a6a8c464cb2ad77a7cd5a /devel | |
| parent | 29bf453e9be51d897ff9c2d13ca1d33fa844a429 (diff) | |
| download | pkgsrc-6d96738b51df969cbafbd852c4390ab76a10735c.tar.gz | |
Link shared library with "/usr/lib/c++rt0.o" on a.out systems to make sure
that pthread_init() gets called. Fixes PR pkg/7433 by Andreas Gustafsson.
Diffstat (limited to 'devel')
| -rw-r--r-- | devel/mit-pthreads/Makefile | 6 | ||||
| -rw-r--r-- | devel/mit-pthreads/patches/patch-ah | 16 |
2 files changed, 10 insertions, 12 deletions
diff --git a/devel/mit-pthreads/Makefile b/devel/mit-pthreads/Makefile index 24895c6c146..1579d535ac1 100644 --- a/devel/mit-pthreads/Makefile +++ b/devel/mit-pthreads/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.17 1999/05/01 18:35:22 tron Exp $ +# $NetBSD: Makefile,v 1.18 1999/05/02 19:46:16 tron Exp $ # DISTNAME= pthreads-1_60_beta6 @@ -12,11 +12,11 @@ MAINTAINER= agc@netbsd.org HOMEPAGE= http://www.mit.edu:8001/people/proven/pthreads.html HAS_CONFIGURE= yes -MAKE_ENV+= NOLINT=1 NOPROFILE=1 +MAKE_ENV+= NOLINT=1 NOPROFILE=1 OBJECT_FMT=${OBJECT_FMT} CONFIGURE_ARGS+= --prefix=${PREFIX}/pthreads pre-install: - -mkdir ${PREFIX}/pthreads + ${MKDIR} ${PREFIX}/pthreads post-install: @${RM} -f ${PREFIX}/pthreads/lib/libpthread_pic.a diff --git a/devel/mit-pthreads/patches/patch-ah b/devel/mit-pthreads/patches/patch-ah index cd173f171cc..715801bfb7c 100644 --- a/devel/mit-pthreads/patches/patch-ah +++ b/devel/mit-pthreads/patches/patch-ah @@ -1,7 +1,7 @@ -$NetBSD: patch-ah,v 1.4 1999/05/01 18:35:22 tron Exp $ +$NetBSD: patch-ah,v 1.5 1999/05/02 19:46:16 tron Exp $ --- config/Makefile.in.orig Fri Mar 22 05:29:54 1996 -+++ config/Makefile.in Sat May 1 20:27:07 1999 ++++ config/Makefile.in Sun May 2 21:19:49 1999 @@ -18,8 +18,8 @@ # Standard bsd install rules look for the "install" program, rather than @@ -22,16 +22,14 @@ $NetBSD: patch-ah,v 1.4 1999/05/01 18:35:22 tron Exp $ .include "${srcdir}/pthreads/Makefile.inc" .include "${srcdir}/stdlib/Makefile.inc" -@@ -40,6 +40,12 @@ +@@ -38,6 +38,10 @@ + .include "${srcdir}/gen/Makefile.inc" + .include "${srcdir}/net/Makefile.inc" .include "${srcdir}/scripts/Makefile.inc" - - .include <bsd.lib.mk> + -+.ifdef OBJECT_FMT +.if (${OBJECT_FMT} == "a.out") -+SHLIB_LDSTARTFILE = /usr/lib/c++rt0.o -+.endif ++SOBJS+= /usr/lib/c++rt0.o +.endif - $(OBJS) : $(config) $(types) $(paths) + .include <bsd.lib.mk> |