krb5 commit: Update shlib.conf for FreeBSD

[Benjamin Kaduk]

https://github.com/krb5/krb5/commit/453b89100eb1c8fa184550f9ab634779981927e4
commit 453b89100eb1c8fa184550f9ab634779981927e4
Author: Ben Kaduk <kaduk at mit.edu>
Date:   Mon Mar 11 22:57:06 2013 -0400

    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.

 src/config/shlib.conf |   25 +++++++++++--------------
 1 files changed, 11 insertions(+), 14 deletions(-)

diff --git a/src/config/shlib.conf b/src/config/shlib.conf
index 3555a3e..9236d86 100644
--- 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)'