Change the workaround for old compiler versions so that it actually works.

Actually simply the workaround in the process.

Fixes problems noted by SUNAGAWA Keiki <kei_sun@ba2.so-net.ne.jp> on
tech-pkg and David W. Talmage <talmage@ricochet.net> in private email.

Tested by SUNAGAWA Keiki.

4 files changed, 15 insertions, 32 deletions

diff --git a/devel/libtool/Makefile.common b/devel/libtool/Makefile.common
index 1d6a958dfaf..22bf2843851 100644
--- a/devel/libtool/Makefile.common
+++ b/devel/libtool/Makefile.common
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile.common,v 1.5 2001/03/12 11:23:03 skrll Exp $
+# $NetBSD: Makefile.common,v 1.6 2001/03/18 17:10:27 skrll Exp $
 #
 
 DISTNAME=	libtool-ml-20010219
 PKGPFX=		${DISTNAME:C/ml-/1.4./}
-PKGREV=		nb3
+PKGREV=		nb4
 WRKSRC=		${WRKDIR}/libtool-ml
 CATEGORIES=	devel pkgtools
 MASTER_SITES=	${MASTER_SITE_LOCAL}
diff --git a/devel/libtool/files/patch-sum b/devel/libtool/files/patch-sum
index c02ae5f54b5..1c626e46a76 100644
--- a/devel/libtool/files/patch-sum
+++ b/devel/libtool/files/patch-sum
@@ -1,9 +1,9 @@
-$NetBSD: patch-sum,v 1.30 2001/03/12 11:23:03 skrll Exp $
+$NetBSD: patch-sum,v 1.31 2001/03/18 17:10:28 skrll Exp $
 
 SHA1 (patch-aa) = 5524bcb4b3ec3faf79e903134ddcb6c8d3dfefe7
 SHA1 (patch-ab) = 18c73a32c1c35c750bd93b1d77e5a1b927d994bf
 SHA1 (patch-ac) = 85ea8ee09d9cf2d2ea005042538466b68d754722
 SHA1 (patch-ad) = 2407b8ef5c210b64c6c7bec28b56e4390f9f0300
 SHA1 (patch-ae) = fae19762fa8ce27c0050c6dffd30424a6ab6f966
-SHA1 (patch-af) = 8de29f3ba4f77de1c8c0e781d5f1064342cddcaf
-SHA1 (patch-ag) = 2e5d6ec05a2ae841074df1363268ef97837c9750
+SHA1 (patch-af) = c5aa39c4be10c7028168d2a39c25035e2c2bbfb2
+SHA1 (patch-ag) = e344f9bb8e42af588b337962e725540aa268c6f6
diff --git a/devel/libtool/patches/patch-af b/devel/libtool/patches/patch-af
index 136c19832be..b094ed66ced 100644
--- a/devel/libtool/patches/patch-af
+++ b/devel/libtool/patches/patch-af
@@ -1,22 +1,15 @@
-$NetBSD: patch-af,v 1.1 2001/02/27 08:20:26 skrll Exp $
+$NetBSD: patch-af,v 1.2 2001/03/18 17:10:28 skrll Exp $
 
---- ltcf-c.sh.orig	Sun Jan 28 05:05:02 2001
+--- ltcf-c.sh.orig	Fri Feb 16 05:05:03 2001
 +++ ltcf-c.sh
-@@ -184,8 +184,15 @@
+@@ -184,8 +184,8 @@
        archive_cmds='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib'
        wlarc=
      else
 -      archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
 -      archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
-+     if $CC -dumpspecs | grep -A1 libgcc | grep shared >/dev/null; then
-+       archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
-+       archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
-+     else
-+       # This causes problems on some platforms because libgcc isn't
-+       # available compiled -fPIC
-+       archive_cmds='$LD -shared -o $lib /usr/lib/crtbeginS.o $libobjs $deplibs $linker_flags -soname $soname /usr/lib/crtendS.o'
-+       wlarc=
-+     fi
++      archive_cmds='$CC -shared -nodefaultlibs $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
++      archive_expsym_cmds='$CC -shared -nodefaultlibs $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
      fi
      ;;
  
diff --git a/devel/libtool/patches/patch-ag b/devel/libtool/patches/patch-ag
index b076122d83f..218539e2e22 100644
--- a/devel/libtool/patches/patch-ag
+++ b/devel/libtool/patches/patch-ag
@@ -1,8 +1,8 @@
-$NetBSD: patch-ag,v 1.1 2001/02/27 08:20:26 skrll Exp $
+$NetBSD: patch-ag,v 1.2 2001/03/18 17:10:29 skrll Exp $
 
---- ltcf-cxx.sh.orig	Tue Feb  6 05:05:05 2001
+--- ltcf-cxx.sh.orig	Fri Feb 16 05:05:03 2001
 +++ ltcf-cxx.sh
-@@ -290,7 +290,33 @@
+@@ -368,7 +368,23 @@
      esac
      ;;
    netbsd*)
@@ -21,23 +21,13 @@ $NetBSD: patch-ag,v 1.1 2001/02/27 08:20:26 skrll Exp $
 +      hardcode_direct=yes
 +      hardcode_libdir_flag_spec='-R$libdir'
 +      hardcode_shlibpathvar_var=no
-+    else
-+      # Workround pre 1.5 gcc LIBGCC_SPEC problems.
-+      if $CC -dumpspecs | grep -A1 libgcc | grep shared >/dev/null; then
-+        archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
-+        archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
-+      else
-+        # This causes problems libgcc isn't available as a shared object.
-+        archive_cmds='$LD -shared -o $lib $predep_objects $libobjs $deplibs $postdep_objects $linker_flags -soname $soname' 
-+        wlarc=
-+      fi
 +    fi
-+    # Make sure that we don't add -lgcc back in via postdep.
++    # Workaround for some pre-1.5 ELF toolchains
 +    output_verbose_link_cmds='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | egrep "\-L" | sed -e "s/-lgcc -lc -lgcc//"'
      ;;
    osf3*)
      if test "$with_gcc" = yes && test "$with_gnu_ld" = no; then
-@@ -859,6 +885,14 @@
+@@ -943,6 +959,14 @@
  
      esac
    done