Import more FreeBSD elf shared library fixes.

diff --git a/build/lib-shared.mk b/build/lib-shared.mk
index 57627f16450afe316e19e988f46ac6955ad2cc6a..76774428f87cf1fbffb866bf0ac03b7827d5cff4 100644 (file)
--- a/build/lib-shared.mk
+++ b/build/lib-shared.mk
@@ -3,7 +3,8 @@
 ## Makefile Template for Shared Libraries
 ##
 
-LINK    = $(LTLINK) -version-info $(LIBVERSION)
+LTVERSION = -version-info $(LIBVERSION)
+LINK    = $(LTLINK)
 COMPILE = $(LIBTOOL) --mode=compile $(CC) $(CFLAGS) -c
 MKDEPFLAG = -l
 

diff --git a/build/ltconfig b/build/ltconfig
index 729792ddb5ad02d292a8e8c4f45a34a9513f5cf3..e4ecdbd7ecaac41b5e049a96fd97e617795a2623 100755 (executable)
--- a/build/ltconfig
+++ b/build/ltconfig
@@ -1134,7 +1134,8 @@ freebsd3*)
   version_type=freebsd
   library_names_spec='${libname}${release}.so.$versuffix $libname.so'
   if [ -x `/usr/bin/objformat` ]; then
-  finish_cmds='PATH="$PATH:/sbin" OBJFORMAT=`objformat` ldconfig -m $libdir'
+  OBJFORMAT=`/usr/bin/objformat`
+  finish_cmds='PATH="$PATH:/sbin" OBJFORMAT="$OBJFORMAT" ldconfig -m $libdir'
   else
   finish_cmds='PATH="$PATH:/sbin" ldconfig -m $libdir'
   fi

diff --git a/build/ltmain.sh b/build/ltmain.sh
index ffacb3dfd6193514d1094d6383928065c65ec3c2..b66dcc0d9a559e5196b20019c17fcc3333348273 100755 (executable)
--- a/build/ltmain.sh
+++ b/build/ltmain.sh
@@ -970,10 +970,17 @@ if test -z "$show_help"; then
       freebsd)
         version_vars="$version_vars major versuffix"
         major="$current"
-       if [ $PORTOBJFORMAT = elf ]; then
-        versuffix="$current";
+               
+       if [ X"$OBJFORMAT" = X ]; then
+               if [ -x /usr/bin/objformat ]; then
+                       OBJECTFORMAT=`objformat`
+               fi
+       fi
+               
+       if [ "$OBJFORMAT" = elf ]; then
+               versuffix="$current";
        else
-        versuffix="$current.$revision";
+               versuffix="$current.$revision";
        fi
         ;;
 

diff --git a/build/top.mk b/build/top.mk
index c37895f021ca36ad54f7fa6b48ec67ebf909c7a2..59f6732c2b373363598fd9878bc745737863fd2b 100644 (file)
--- a/build/top.mk
+++ b/build/top.mk
@@ -49,7 +49,7 @@ MKDEP = $(top_srcdir)/build/mkdep $(MKDEPFLAG) -c "$(CC)"
 
 LIBTOOL = @LIBTOOL@
 LIBVERSION = 1:0:0
-LTLINK  = $(LIBTOOL) --mode=link $(CC) $(CFLAGS) $(LFLAGS)
+LTLINK  = $(LIBTOOL) --mode=link $(CC) $(CFLAGS) $(LFLAGS) $(LTVERSION)
 LTINSTALL = $(LIBTOOL) --mode=install $(INSTALL) 
 
 # Misc UNIX commands used in makefiles