Update shlib.conf for FreeBSD

FreeBSD has not emitted a.out binaries by default for a very long
time; elf is the standard.

Take sparc64 conditional for PICFLAGS from downstream.

Enable "new" dtags (supported since FreeBSD 5.0) -- this
prevents rpath entries in libraries from taking precedence over
LD_LIBRARY_PATH, useful for testing.

diff --git a/src/config/shlib.conf b/src/config/shlib.conf
index 3555a3e39d0991fe6c5bb53f15ad27a71dd898e0..9236d863cc50ad9734e58efc28bc600e6cf5a81a 100644 (file)
--- a/src/config/shlib.conf
+++ b/src/config/shlib.conf
@@ -306,25 +306,22 @@ mips-*-netbsd*)
        ;;
 
 *-*-freebsd*)
-       if test -x /usr/bin/objformat ; then
-               objformat=`/usr/bin/objformat`
-       else
-               objformat="elf"
-       fi
-       PICFLAGS=-fpic
-       if test "x$objformat" = "xelf" ; then
-               SHLIBVEXT='.so.$(LIBMAJOR)'
-               RPATH_FLAG='-Wl,-rpath -Wl,'
-       else
-               RPATH_FLAG=-R
-               SHLIBVEXT='.so.$(LIBMAJOR).$(LIBMINOR)'
-       fi
+       case $krb5_cv_host in
+               sparc64-*)
+                       PICFLAGS=-fPIC
+                       ;;
+               *)
+                       PICFLAGS=-fpic
+                       ;;
+       esac
+       SHLIBVEXT='.so.$(LIBMAJOR)'
+       RPATH_FLAG='-Wl,--enable-new-dtags -Wl,-rpath -Wl,'
        PROG_RPATH_FLAGS='$(RPATH_FLAG)$(PROG_RPATH)'
        CC_LINK_SHARED='$(CC) $(PROG_LIBPATH) $(PROG_RPATH_FLAGS) $(CFLAGS) $(LDFLAGS)'
        CXX_LINK_SHARED='$(CXX) $(PROG_LIBPATH) $(PROG_RPATH_FLAGS) $(CXXFLAGS) $(LDFLAGS)'
        SHLIBEXT=.so
        LDCOMBINE='ld -Bshareable'
-       SHLIB_RPATH_FLAGS='-R$(SHLIB_RDIRS)'
+       SHLIB_RPATH_FLAGS='--enable-new-dtags -rpath $(SHLIB_RDIRS)'
        SHLIB_EXPFLAGS='$(SHLIB_RPATH_FLAGS) $(SHLIB_DIRS) $(SHLIB_EXPLIBS)'
        CC_LINK_STATIC='$(CC) $(PROG_LIBPATH) $(CFLAGS) $(LDFLAGS)'
        CXX_LINK_STATIC='$(CXX) $(PROG_LIBPATH) $(CXXFLAGS) $(LDFLAGS)'