From 5d1a5a5fda898b67613b81c9e9ffd6e2c73d3b61 Mon Sep 17 00:00:00 2001
From: skrll <skrll@pkgsrc.org>
Date: Fri, 31 Jan 2003 20:33:51 +0000
Subject: [PATCH] Don't use -nodefaultlibs when linking C libraries - this was
 for old broken ELF toolchains. glib2 on -current will now link correctly as
 -pthread will have an effect.

PKGREVISION++
---
 devel/libtool/Makefile.common  |  4 ++--
 devel/libtool/distinfo         |  4 ++--
 devel/libtool/patches/patch-am | 19 ++++++++++++++-----
 3 files changed, 18 insertions(+), 9 deletions(-)

diff --git a/devel/libtool/Makefile.common b/devel/libtool/Makefile.common
index a7ddb6c40984..068fd02785a6 100644
--- a/devel/libtool/Makefile.common
+++ b/devel/libtool/Makefile.common
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile.common,v 1.28 2003/01/31 20:29:09 skrll Exp $
+# $NetBSD: Makefile.common,v 1.29 2003/01/31 20:33:51 skrll Exp $
 #
 
 DISTNAME=	libtool-ml-20010614
 PKGPFX=		${DISTNAME:C/ml-/1.4./}
-PKGREVISION=	12
+PKGREVISION=	13
 WRKSRC=		${WRKDIR}/libtool-ml
 CATEGORIES=	devel pkgtools
 MASTER_SITES=	${MASTER_SITE_LOCAL}
diff --git a/devel/libtool/distinfo b/devel/libtool/distinfo
index fb9097a2b234..eb9438231017 100644
--- a/devel/libtool/distinfo
+++ b/devel/libtool/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.23 2003/01/21 22:43:42 grant Exp $
+$NetBSD: distinfo,v 1.24 2003/01/31 20:33:51 skrll Exp $
 
 SHA1 (libtool-ml-20010614.tar.gz) = ff746666737e420592c3017d65bf4c47f1430dac
 Size (libtool-ml-20010614.tar.gz) = 784246 bytes
@@ -14,5 +14,5 @@ SHA1 (patch-ai) = bf5296409ccba34bccbc5ed289eeaa8350d7176e
 SHA1 (patch-aj) = 5382fc0a6a58687da5523c596118a4eeb948f675
 SHA1 (patch-ak) = 7e7c6a515361863b683bbc8be24c8146501ca864
 SHA1 (patch-al) = 22f1b7289d9ba477255e66364ae23af24a298dd0
-SHA1 (patch-am) = cedc92d0e229ced47ca5eb6ad4997fb1506d5ec9
+SHA1 (patch-am) = 0057a15d9bdb5a70d4964df49aa3e905ff7d9cf5
 SHA1 (patch-ao) = 4e115e9d6ddde556205dc786cde471bfee5a5e9e
diff --git a/devel/libtool/patches/patch-am b/devel/libtool/patches/patch-am
index 30f2f5c49b52..c6fff94b711c 100644
--- a/devel/libtool/patches/patch-am
+++ b/devel/libtool/patches/patch-am
@@ -1,8 +1,8 @@
-$NetBSD: patch-am,v 1.4 2002/08/25 18:38:36 jlam Exp $
+$NetBSD: patch-am,v 1.5 2003/01/31 20:33:52 skrll Exp $
 
---- ltcf-c.sh.orig	Wed Apr 25 00:05:02 2001
+--- ltcf-c.sh.orig	2001-04-25 04:05:02.000000000 +0000
 +++ ltcf-c.sh
-@@ -173,16 +173,6 @@
+@@ -173,23 +173,13 @@ EOF
        $CC $output_objdir/$soname-exp '$lt_cv_cc_dll_switch' -Wl,-e,'$dll_entry' -o $output_objdir/$soname '$ltdll_obj'$libobjs $deplibs $compiler_flags'
      ;;
  
@@ -19,7 +19,16 @@ $NetBSD: patch-am,v 1.4 2002/08/25 18:38:36 jlam Exp $
    netbsd*)
      if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
        archive_cmds='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib'
-@@ -379,6 +369,23 @@
+       wlarc=
+     else
+-      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'
++      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'
+     fi
+     ;;
+ 
+@@ -379,6 +369,23 @@ else
      fix_srcfile_path='`cygpath -w "$srcfile"`'
      ;;
  
@@ -43,7 +52,7 @@ $NetBSD: patch-am,v 1.4 2002/08/25 18:38:36 jlam Exp $
    freebsd1*)
      ld_shlibs=no
      ;;
-@@ -644,7 +651,7 @@
+@@ -644,7 +651,7 @@ else
      darwin* | rhapsody*)
        # PIC is the default on this platform
        # Common symbols not allowed in MH_DYLIB files