From 3bcaeb4a87785e669b6cb3623a3f197ed7beabfe Mon Sep 17 00:00:00 2001
From: "wtc%netscape.com" <wtc%netscape.com>
Date: Thu, 27 Mar 2003 01:17:28 +0000
Subject: [PATCH] Bug 199134: fixed build failures on FreeBSD.  We need to
 specify -pthread when linking an executable (already doing that when linking
 a shared lib), and we need to use the -rpath-link flag to help the linker
 find the shared libraries that we indirectly link with.  r=cls. Modified
 Files: coreconf/FreeBSD.mk nss/cmd/platlibs.mk

---
 security/coreconf/FreeBSD.mk | 1 +
 security/nss/cmd/platlibs.mk | 4 ++++
 2 files changed, 5 insertions(+)

diff --git a/security/coreconf/FreeBSD.mk b/security/coreconf/FreeBSD.mk
index c07df1a6cca9..7fc55c6e3d3e 100644
--- a/security/coreconf/FreeBSD.mk
+++ b/security/coreconf/FreeBSD.mk
@@ -57,6 +57,7 @@ DSO_LDOPTS		= -shared -Wl,-soname -Wl,$(notdir $@)
 ifndef CLASSIC_NSPR
 USE_PTHREADS		= 1
 DEFINES			+= -D_THREAD_SAFE -D_REENTRANT
+OS_LIBS			+= -pthread
 DSO_LDOPTS		+= -pthread
 endif
 
diff --git a/security/nss/cmd/platlibs.mk b/security/nss/cmd/platlibs.mk
index 6a6303604e40..4a99534616dc 100644
--- a/security/nss/cmd/platlibs.mk
+++ b/security/nss/cmd/platlibs.mk
@@ -189,6 +189,10 @@ ifeq ($(OS_ARCH), BSD_OS)
 EXTRA_SHARED_LIBS += -Wl,-rpath-link,$(DIST)/lib
 endif
 
+ifeq ($(OS_ARCH), FreeBSD)
+EXTRA_SHARED_LIBS += -Wl,-rpath-link,$(DIST)/lib
+endif
+
 ifeq ($(OS_ARCH), Darwin)
 EXTRA_SHARED_LIBS += -dylib_file @executable_path/libsoftokn3.dylib:$(DIST)/lib/libsoftokn3.dylib
 endif