From: Jim Rees <rees@umich.edu>
Date: Tue, 25 Oct 2005 07:36:38 +0000 (+0000)
Subject: STABLE14-libafssetpag-temp-fix-20051018
X-Git-Tag: openafs-stable-1_4_1-rc2~39
X-Git-Url: https://git.michaelhowe.org/gitweb/?a=commitdiff_plain;h=8b42f74f6f96e31fcc84c07acbe0b82797bdd47b;p=packages%2Fo%2Fopenafs.git

STABLE14-libafssetpag-temp-fix-20051018


Define SHLIB_LINKER for [fno]bsd
Don't try to build LIBAFSSETPAG for [fno]bsd


(cherry picked from commit f48eb4ab590f25162f45a1671ad0917c6ebceeee)
---

diff --git a/src/cf/osconf.m4 b/src/cf/osconf.m4
index 112be0d51..3ee52c951 100644
--- a/src/cf/osconf.m4
+++ b/src/cf/osconf.m4
@@ -208,6 +208,7 @@ case $AFS_SYSNAME in
 		MT_LIBS="-pthread"
 		PAM_CFLAGS="-O2 -pipe -fPIC"
 		SHLIB_LDFLAGS="-shared -Xlinker -x"
+		SHLIB_LINKER="${MT_CC} -shared"
 		TXLIBS="-lncurses"
 		XCFLAGS="-O2 -pipe"
 		YACC="byacc"
@@ -219,6 +220,7 @@ case $AFS_SYSNAME in
 		MT_LIBS="-lpthread" # XXX -pthread soon
 		PAM_CFLAGS="-O2 -pipe -fPIC"
 		SHLIB_LDFLAGS="-shared -Xlinker -x"
+		SHLIB_LINKER="${MT_CC} -shared"
 		TXLIBS="/usr/lib/libcurses.so"
 		XCFLAGS="-O2 -pipe"
 		YACC="yacc"
@@ -230,6 +232,7 @@ case $AFS_SYSNAME in
 		MT_LIBS=""
 		PAM_CFLAGS="-O2 -pipe -fPIC"
 		SHLIB_LDFLAGS="-shared -Xlinker -x"
+		SHLIB_LINKER="${MT_CC} -shared"
 		TXLIBS="/usr/lib/libcurses.so"
 		XCFLAGS="-O2 -pipe"
 		YACC="bison -y"
@@ -370,6 +373,7 @@ case $AFS_SYSNAME in
 		PAM_CFLAGS="-O2 -pipe -fpic"
 		SHLIB_CFLAGS="-fpic"
 		SHLIB_LDFLAGS="-shared -Xlinker -x"
+		SHLIB_LINKER="${MT_CC} -shared"
 		TXLIBS="/usr/lib/libcurses.a"
 		XCFLAGS="-O2"
 		YACC="yacc"
diff --git a/src/sys/Makefile.in b/src/sys/Makefile.in
index 5933eea0b..46ea93897 100644
--- a/src/sys/Makefile.in
+++ b/src/sys/Makefile.in
@@ -62,6 +62,8 @@ ${LIBAFSSETPAG}: ${SHLIBOBJS}
 	sun*_5*) \
 	    ${SHLIB_LINKER} -h libafssetpag.so.${LIBAFSSETPAGMAJOR} \
 	        -o ${LIBAFSSETPAG} ${SHLIBOBJS};; \
+	*bsd*) \
+	    touch ${LIBAFSSETPAG};; \
 	*) \
 	    ${SHLIB_LINKER} -o ${LIBAFSSETPAG} ${SHLIBOBJS};; \
 	esac