diff options
| author | Norikatsu Shigemura <nork@FreeBSD.org> | 2006-11-29 14:14:13 +0000 |
|---|---|---|
| committer | Norikatsu Shigemura <nork@FreeBSD.org> | 2006-11-29 14:14:13 +0000 |
| commit | 8c551f63353c08c47ea97d67f0e61c8414405165 (patch) | |
| tree | 2d948df86ef25ff73231e2e23c45494e2f60f57e /devel/nspr | |
| parent | - Update to 0.8.3 (diff) | |
PTHREAD_LIB-safeness.
Approved by: ahze (gnome)
Notes
Notes:
svn path=/head/; revision=178255
Diffstat (limited to 'devel/nspr')
| -rw-r--r-- | devel/nspr/Makefile | 5 | ||||
| -rw-r--r-- | devel/nspr/files/patch-..::configure | 20 | ||||
| -rw-r--r-- | devel/nspr/files/patch-.._pr_tests_Makefile | 11 |
3 files changed, 30 insertions, 6 deletions
diff --git a/devel/nspr/Makefile b/devel/nspr/Makefile index 35561283893a..8a90848daf3e 100644 --- a/devel/nspr/Makefile +++ b/devel/nspr/Makefile @@ -30,8 +30,9 @@ LIBS= libnspr4.so.1 libplc4.so.1 libplds4.so.1 .include <bsd.port.pre.mk> -.if ${OSVERSION} < 601104 post-patch: + @${REINPLACE_CMD} -e 's,-lpthread,${PTHREAD_LIBS},g' ${WRKSRC}/${CONFIGURE_SCRIPT} +.if ${OSVERSION} < 601104 @${REINPLACE_CMD} -e 's|pthread_cond_wait|_pthread_cond_wait|g' \ ${WRKSRC}/../pr/src/md/unix/pthreads_user.c \ ${WRKSRC}/../pr/src/pthreads/ptsynch.c @@ -51,7 +52,7 @@ do-install: .endfor prtests: - ${GMAKE} -C ${WRKSRC}/pr/tests + env PTHREAD_LIBS="${PTHREAD_LIBS}" ${GMAKE} -C ${WRKSRC}/pr/tests ${LN} -sf libmy.so.1 ${WRKSRC}/pr/tests/dll/libmy.so cd ${WRKSRC}/pr/tests && ../../../pr/tests/runtests.sh diff --git a/devel/nspr/files/patch-..::configure b/devel/nspr/files/patch-..::configure index 8b424123d6f2..e74898f2ca8c 100644 --- a/devel/nspr/files/patch-..::configure +++ b/devel/nspr/files/patch-..::configure @@ -1,6 +1,6 @@ ---- ../configure.orig Thu Aug 4 21:32:00 2005 -+++ ../configure Thu Aug 4 21:35:41 2005 -@@ -3379,16 +3379,21 @@ +--- ../configure.orig Tue Nov 14 10:37:41 2006 ++++ ../configure Mon Nov 27 22:52:52 2006 +@@ -3466,16 +3466,21 @@ #define HAVE_SOCKLEN_T 1 EOF @@ -24,7 +24,19 @@ MDCPUCFG_H=_freebsd.cfg PR_MD_CSRCS=freebsd.c ;; -@@ -5729,6 +5734,7 @@ +@@ -5467,11 +5472,6 @@ + #define _THREAD_SAFE 1 + EOF + +- if test "$ac_cv_have_dash_pthread" = "yes"; then +- _PTHREAD_LDFLAGS="-pthread" +- else +- _PTHREAD_LDFLAGS="-lc_r" +- fi + ;; + *-netbsd*) + if test "$ac_cv_have_dash_pthread" = "yes"; then +@@ -5864,6 +5864,7 @@ config/nsprincl.mk config/nsprincl.sh config/nspr-config diff --git a/devel/nspr/files/patch-.._pr_tests_Makefile b/devel/nspr/files/patch-.._pr_tests_Makefile new file mode 100644 index 000000000000..af796164c9ea --- /dev/null +++ b/devel/nspr/files/patch-.._pr_tests_Makefile @@ -0,0 +1,11 @@ +--- ../../nsprpub/pr/tests/Makefile.in.orig Mon Apr 26 00:01:02 2004 ++++ ../../nsprpub/pr/tests/Makefile.in Tue Nov 28 11:08:14 2006 +@@ -418,7 +418,7 @@ + + ifeq ($(OS_ARCH),FreeBSD) + ifeq ($(USE_PTHREADS),1) +-LDOPTS += -pthread ++LDOPTS += ${PTHREAD_LIBS} + endif + LDOPTS += -Xlinker -R $(ABSOLUTE_LIB_DIR) + endif |