[pkgsrc/trunk]: pkgsrc/devel nb3: Add OS-specific fix for -pthread on DragonF...

[tv <tv%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/af8cfc45866c
branches:  trunk
changeset: 495242:af8cfc45866c
user:      tv <tv%pkgsrc.org@localhost>
date:      Sun Jun 05 18:04:37 2005 +0000

description:
nb3: Add OS-specific fix for -pthread on DragonFly, based on work by
Joerg Sonnenberger <joerg%britannica.bec.de@localhost>.

diffstat:

 devel/libtool-base/Makefile    |   4 +-
 devel/libtool/distinfo         |   4 +-
 devel/libtool/patches/patch-ac |  52 ++++++++++++++++++++++++++++++++++++++---
 3 files changed, 52 insertions(+), 8 deletions(-)

diffs (107 lines):

diff -r c2dfd24405be -r af8cfc45866c devel/libtool-base/Makefile
--- a/devel/libtool-base/Makefile       Sun Jun 05 17:50:51 2005 +0000
+++ b/devel/libtool-base/Makefile       Sun Jun 05 18:04:37 2005 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.67 2005/05/22 19:11:12 jlam Exp $
+# $NetBSD: Makefile,v 1.68 2005/06/05 18:04:37 tv Exp $
 
 ###########################################################################
 ###########################################################################
@@ -26,7 +26,7 @@
 .include "../../devel/libtool/Makefile.common"
 
 PKGNAME=       ${DISTNAME:S/-/-base-/}
-PKGREVISION=   2
+PKGREVISION=   3
 SVR4_PKGNAME=  ltoob
 
 COMMENT=       Generic shared library support script (the script itself)
diff -r c2dfd24405be -r af8cfc45866c devel/libtool/distinfo
--- a/devel/libtool/distinfo    Sun Jun 05 17:50:51 2005 +0000
+++ b/devel/libtool/distinfo    Sun Jun 05 18:04:37 2005 +0000
@@ -1,9 +1,9 @@
-$NetBSD: distinfo,v 1.59 2005/05/18 14:40:04 tv Exp $
+$NetBSD: distinfo,v 1.60 2005/06/05 18:04:37 tv Exp $
 
 SHA1 (libtool-1.5.18.tar.gz) = 9eae4a25cf386f2dd3937f215368c9cc090009df
 RMD160 (libtool-1.5.18.tar.gz) = facff15723bb89b0e260def31354fe437430bf3b
 Size (libtool-1.5.18.tar.gz) = 2780846 bytes
 SHA1 (patch-aa) = 36f589c09c492bc688bdfbb97f0d375cd04c008d
 SHA1 (patch-ab) = 89c29eff6957e75a78f76b075194b752bb1997b5
-SHA1 (patch-ac) = 381f835a8fe188d3b038de074a61502bc8f4a27a
+SHA1 (patch-ac) = e7a067d002f7948361e2e90862cb96c6bba1959d
 SHA1 (patch-ad) = 46fdc723421a2b3198bcbaa95eafc89441465544
diff -r c2dfd24405be -r af8cfc45866c devel/libtool/patches/patch-ac
--- a/devel/libtool/patches/patch-ac    Sun Jun 05 17:50:51 2005 +0000
+++ b/devel/libtool/patches/patch-ac    Sun Jun 05 18:04:37 2005 +0000
@@ -1,6 +1,6 @@
-$NetBSD: patch-ac,v 1.18 2005/05/18 11:57:12 adam Exp $
+$NetBSD: patch-ac,v 1.19 2005/06/05 18:04:37 tv Exp $
 
---- ltmain.sh.orig     Mon May 16 11:39:29 2005
+--- ltmain.sh.orig     2005-05-16 05:39:29.000000000 -0400
 +++ ltmain.sh
 @@ -188,6 +188,31 @@ func_win32_libid ()
  # arg is usually of the form 'gcc ...'
@@ -85,7 +85,51 @@
          if test "$prev" = rpath; then
            case "$rpath " in
            *" $arg "*) ;;
-@@ -3202,6 +3255,7 @@ EOF
+@@ -1523,6 +1576,12 @@ EOF
+       compiler_flags="$compiler_flags $arg"
+       compile_command="$compile_command $arg"
+       finalize_command="$finalize_command $arg"
++      case $host:$arg in
++      *-*-dragonfly*:-pthread)
++        # pkgsrc hack to use -pthread in .la file for final linking
++        deplibs="$deplibs $arg"
++        ;;
++      esac
+       continue
+       ;;
+ 
+@@ -2013,6 +2072,30 @@ EOF
+         else
+           compiler_flags="$compiler_flags $deplib"
+         fi
++        case $host:$deplib in
++        *-*-dragonfly*:-pthread)
++          # pkgsrc hack to use -pthread in .la file for final linking
++          case $linkmode in
++          lib)
++            deplibs="$deplib $deplibs"
++            test "$pass" = conv && continue
++            newdependency_libs="$deplib $newdependency_libs"
++            ;;
++          prog)
++            if test "$pass" = conv; then
++              deplibs="$deplib $deplibs"
++              continue
++            fi
++            if test "$pass" = scan; then
++              deplibs="$deplib $deplibs"
++            else
++              compile_deplibs="$deplib $compile_deplibs"
++              finalize_deplibs="$deplib $finalize_deplibs"
++            fi
++            ;;
++          esac
++          ;;
++        esac
+         continue
+         ;;
+       -l*)
+@@ -3202,6 +3285,7 @@ EOF
        linux)
          major=.`expr $current - $age`
          versuffix="$major.$age.$revision"
@@ -93,7 +137,7 @@
          ;;
  
        osf)
-@@ -5462,8 +5516,16 @@ relink_command=\"$relink_command\""
+@@ -5462,8 +5546,16 @@ relink_command=\"$relink_command\""
        exit $EXIT_FAILURE
      fi