From: Ben Kaduk <kaduk@mit.edu>
Date: Wed, 16 Oct 2013 00:57:26 +0000 (-0400)
Subject: Tidy up MakefileProto.FBSD.in
X-Git-Tag: upstream/1.6.6_pre2^2~25
X-Git-Url: https://git.michaelhowe.org/gitweb/?a=commitdiff_plain;h=e2bdca9aa7af4636f411d1c9aabc485da20225b9;p=packages%2Fo%2Fopenafs.git

Tidy up MakefileProto.FBSD.in

We don't support FreeBSD 6.x and older now.  As such, we can convert
entirely to the "new" world order, and not have to worry about adding
new sysnames to the conditionals every time we add them.  FreeBSD 7.x
is no longer supported by upstream, but it does not impose an undue
burden on us to continue to build on FreeBSD 7.1 and higher; the code
needed for 7.0 exactly can be removed, though.

(The sense of the conditionals should really have been reversed anyway,
so that the default case would catch new sysnames correctly.  Too late now.)

This is a 1.6-only change, as the libafs build system on master is quite
different.

Change-Id: Iad5d8b6edb9140b38568ab57ffecf0cfdaf1cbd3
Reviewed-on: http://gerrit.openafs.org/10375
Tested-by: BuildBot <buildbot@rampaginggeek.com>
Reviewed-by: Jeffrey Altman <jaltman@your-file-system.com>
Reviewed-by: Stephan Wiesand <stephan.wiesand@desy.de>
---

diff --git a/src/libafs/MakefileProto.FBSD.in b/src/libafs/MakefileProto.FBSD.in
index efc5f9b15..92461c9f6 100644
--- a/src/libafs/MakefileProto.FBSD.in
+++ b/src/libafs/MakefileProto.FBSD.in
@@ -42,9 +42,7 @@ KOPTS = -fPIC -mno-red-zone
 
 KDEFS=-Wall -nostdinc -I/usr/include -D_KERNEL -DKLD_MODULE \
 	-elf \
-<i386_fbsd_60>
 	-mno-mmx -mno-3dnow -mno-sse -mno-sse2 \
-<all>
 	-mno-align-long-strings -fno-common -ffreestanding \
 	-I${KBLD} -include opt_global.h -fno-strict-aliasing
 
@@ -72,15 +70,11 @@ setup:
 	-$(RM) -f  h net netinet rpc ufs nfs  machine sys vm
 	-ln -fs ${KSRC}/net net
 <amd64 i386>
-	-ln -fs ${KSRC}/x86/include machine
+	-ln -fs ${KSRC}/x86/include x86
 <all>
 	-ln -fs ${KSRC}/netinet netinet
 	-ln -fs ${KSRC}/nfs nfs
-<fbsd_50 fbsd_51 fbsd_52 fbsd_53 fbsd_60 fbsd_61 fbsd_62 fbsd_70>
-	-ln -fs /usr/include/rpc rpc
-<all -fbsd_50 -fbsd_51 -fbsd_52 -fbsd_53 -fbsd_60 -fbsd_61 -fbsd_62 -fbsd_70>
 	-ln -fs ${KSRC}/rpc rpc
-<all>
 	-ln -fs ${KSRC}/sys sys
 	-ln -fs ${KSRC}/ufs/ufs ufs
 	-ln -fs ${KSRC}/sys h
diff --git a/src/libuafs/MakefileProto.FBSD.in b/src/libuafs/MakefileProto.FBSD.in
index 642fe6a09..33f0c48df 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=
-<fbsd_50 fbsd_51 fbsd_52 fbsd_53 fbsd_60 fbsd_61>
-TEST_LIBS=-lc_r
-<all -fbsd_50 -fbsd_51 -fbsd_52 -fbsd_53 -fbsd_60 -fbsd_61>
 TEST_LIBS=-lpthread
-<all>
 
 LIBUAFS = libuafs.a
 LIBJUAFS = libjuafs.a