[PATCH] libtool & OpenBSD

[Brad]

Second time around, maybe someone can deal with this this time.

// Brad

----- Forwarded message from Brad <address@hidden> -----

Delivered-To: address@hidden
From: Brad <address@hidden>
To: address@hidden
Subject: [PATCH] libtool & OpenBSD
User-Agent: Mutt/1.4i
Errors-To: address@hidden
X-BeenThere: address@hidden
X-Mailman-Version: 2.0.11
Precedence: bulk
List-Help: <mailto:address@hidden>
List-Post: <mailto:address@hidden>
List-Subscribe: <http://mail.gnu.org/mailman/listinfo/libtool-patches>,
        <mailto:address@hidden>
List-Id: Patch submission list for the GNU libtool shared library maintenance 
tool <libtool-patches.gnu.org>
List-Unsubscribe: <http://mail.gnu.org/mailman/listinfo/libtool-patches>,
        <mailto:address@hidden>
List-Archive: <http://mail.gnu.org/pipermail/libtool-patches/>
Date: Sat, 24 Aug 2002 12:38:18 -0400

Patches for 1.4 and HEAD branches.

>From Brad <address@hidden>
libtool.m4: $linker_flag -> $compiler_flag for OpenBSD
            archive_cmds entries using $CC.

// Brad

address@hidden
address@hidden

--- libtool-1.4/libtool.m4.orig Sat Aug 24 12:10:44 2002
+++ libtool-1.4/libtool.m4      Sat Aug 24 12:13:40 2002
@@ -1666,7 +1666,7 @@ else
     hardcode_direct=yes
     hardcode_shlibpath_var=no
     if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test 
"$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
-      archive_cmds='$CC -shared $pic_flag -o $lib $libobjs $deplibs 
$linker_flags'
+      archive_cmds='$CC -shared $pic_flag -o $lib $libobjs $deplibs 
$compiler_flags'
       hardcode_libdir_flag_spec='${wl}-rpath,$libdir'
       export_dynamic_flag_spec='${wl}-E'
     else
@@ -1676,7 +1676,7 @@ else
        hardcode_libdir_flag_spec='-R$libdir'
         ;;
       *)
-        archive_cmds='$CC -shared $pic_flag -o $lib $libobjs $deplibs 
$linker_flags'
+        archive_cmds='$CC -shared $pic_flag -o $lib $libobjs $deplibs 
$compiler_flags'
         hardcode_libdir_flag_spec='${wl}-rpath,$libdir'
         ;;
       esac

--- libtool/libtool.m4.orig     Sat Aug 24 12:15:31 2002
+++ libtool/libtool.m4  Sat Aug 24 12:19:10 2002
@@ -5065,9 +5065,8 @@ EOF
     openbsd*)
       _LT_AC_TAGVAR(hardcode_direct, $1)=yes
       _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
-
       if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test 
"$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
-       _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag -o $lib $libobjs 
$deplibs $linker_flags'
+       _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag -o $lib $libobjs 
$deplibs $compiler_flags'
        _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir'
        _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E'
       else
@@ -5077,7 +5076,7 @@ EOF
           _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir'
           ;;
         *)
-          _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag -o $lib 
$libobjs $deplibs $linker_flags'
+          _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag -o $lib 
$libobjs $deplibs $compiler_flags'
           _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir'
           ;;
        esac


----- End forwarded message -----