From: Garrett Wollman <wollman@csail.mit.edu>
Date: Sun, 15 Jul 2012 15:56:15 +0000 (-0400)
Subject: FBSD: don't reference libc_r; no release OpenAFS works on still uses it
X-Git-Tag: upstream/1.8.0_pre1^2~2230
X-Git-Url: https://git.michaelhowe.org/gitweb/?a=commitdiff_plain;h=59e0efd22e9a36102a7aa6a544f89f6f2cd3edea;p=packages%2Fo%2Fopenafs.git

FBSD: don't reference libc_r; no release OpenAFS works on still uses it

libc_r is the old user-mode threading library.  Modern versions of
FreeBSD don't include it, and the conditionals here that (nearly
always) override it with the correct library, libpthread, are true
on every version of FreeBSD for which OpenAFS might plausibly be
compiled.  So just use the correct library all the time.

Change-Id: I8f813814973cec3173f44636523c3bf0bee27b3e
Reviewed-on: http://gerrit.openafs.org/7764
Tested-by: BuildBot <buildbot@rampaginggeek.com>
Reviewed-by: Derrick Brashear <shadow@dementix.org>
---

diff --git a/src/libuafs/MakefileProto.FBSD.in b/src/libuafs/MakefileProto.FBSD.in
index 560f71f6d..7700b83f2 100644
--- a/src/libuafs/MakefileProto.FBSD.in
+++ b/src/libuafs/MakefileProto.FBSD.in
@@ -23,11 +23,7 @@ OPTF=-O
 
 TEST_CFLAGS=-D_REENTRANT -DAFS_PTHREAD_ENV -DAFS_FBSD50_ENV $(XCFLAGS)
 TEST_LDFLAGS=
-<all -fbsd_62 -fbsd_70 -fbsd_71 -fbsd_72 -fbsd_73 -fbsd_74 -fbsd_80 -fbsd_81 -fbsd_90>
-TEST_LIBS=-lc_r
-<fbsd_62 fbsd_70 fbsd_71 fbsd_72 fbsd_73 fbsd_74 fbsd_80 fbsd_81 fbsd_82 fbsd_90>
 TEST_LIBS=-lpthread
-<all>
 
 LIBUAFS = libuafs.a
 LIBJUAFS = libjuafs.a