]> git.michaelhowe.org Git - packages/o/openafs.git/commitdiff
STABLE14-libafssetpag-temp-fix-20051018
authorJim Rees <rees@umich.edu>
Tue, 25 Oct 2005 07:36:38 +0000 (07:36 +0000)
committerDerrick Brashear <shadow@dementia.org>
Tue, 25 Oct 2005 07:36:38 +0000 (07:36 +0000)
Define SHLIB_LINKER for [fno]bsd
Don't try to build LIBAFSSETPAG for [fno]bsd

(cherry picked from commit f48eb4ab590f25162f45a1671ad0917c6ebceeee)

src/cf/osconf.m4
src/sys/Makefile.in

index 112be0d51b4dc0c231b13993ce59766469b667f0..3ee52c951f0f5965ef0c7aaf13e295492dd20392 100644 (file)
@@ -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"
index 5933eea0bd6e2a8a124742a8263d69a15a406839..46ea938972fd07bc4d967a2c8672594ca83dbba1 100644 (file)
@@ -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