From fff7c2fe29b5187a0c36441521d92c6513cdec88 Mon Sep 17 00:00:00 2001 From: Ben Kaduk Date: Tue, 19 Feb 2013 15:24:04 -0500 Subject: [PATCH] FreeBSD version compatibility for 1.6.x This is a direct commit, not a cherry-pick, as the libafs build is different for master and the 1.6 branch. Instead of needing to always play catch-up, reverse the sense of the conditional and specifically exclude the FreeBSD 5.x and 6.x versions so that new versions will automatically be in the right conditional. Change-Id: Ifa1d4004faab8a7d6a94ca8d5aeff90e4c51b88e Reviewed-on: http://gerrit.openafs.org/9143 Tested-by: BuildBot Reviewed-by: Andrew Deason Reviewed-by: Stephan Wiesand --- src/libafs/MakefileProto.FBSD.in | 8 +++++--- src/libuafs/MakefileProto.FBSD.in | 4 ++-- 2 files changed, 7 insertions(+), 5 deletions(-) diff --git a/src/libafs/MakefileProto.FBSD.in b/src/libafs/MakefileProto.FBSD.in index 0e682af7a..efc5f9b15 100644 --- a/src/libafs/MakefileProto.FBSD.in +++ b/src/libafs/MakefileProto.FBSD.in @@ -71,12 +71,14 @@ setup: ln -fs ../Makefile.common $(KOBJ)/Makefile.common -$(RM) -f h net netinet rpc ufs nfs machine sys vm -ln -fs ${KSRC}/net net - -ln -fs ${KSRC}/@HOST_CPU@/include machine + + -ln -fs ${KSRC}/x86/include machine + -ln -fs ${KSRC}/netinet netinet -ln -fs ${KSRC}/nfs nfs - + -ln -fs /usr/include/rpc rpc - + -ln -fs ${KSRC}/rpc rpc -ln -fs ${KSRC}/sys sys diff --git a/src/libuafs/MakefileProto.FBSD.in b/src/libuafs/MakefileProto.FBSD.in index ab533d1c0..642fe6a09 100644 --- a/src/libuafs/MakefileProto.FBSD.in +++ b/src/libuafs/MakefileProto.FBSD.in @@ -23,9 +23,9 @@ OPTF=-O TEST_CFLAGS=-D_REENTRANT -DAFS_PTHREAD_ENV -DAFS_FBSD50_ENV $(XCFLAGS) TEST_LDFLAGS= - + TEST_LIBS=-lc_r - + TEST_LIBS=-lpthread -- 2.39.5