diff options
| author | tv <tv@pkgsrc.org> | 2005-06-05 18:04:37 +0000 |
|---|---|---|
| committer | tv <tv@pkgsrc.org> | 2005-06-05 18:04:37 +0000 |
| commit | ff22b74536091b637b27462bfe0c134557435bdf (patch) | |
| tree | 8d61cb68be326dd2428496b31c00b059d102b6c8 /devel/libtool | |
| parent | 6e0c57e044905677e2c9e80d0114c600bd86174c (diff) | |
| download | pkgsrc-ff22b74536091b637b27462bfe0c134557435bdf.tar.gz | |
nb3: Add OS-specific fix for -pthread on DragonFly, based on work by
Joerg Sonnenberger <joerg@britannica.bec.de>.
Diffstat (limited to 'devel/libtool')
| -rw-r--r-- | devel/libtool/distinfo | 4 | ||||
| -rw-r--r-- | devel/libtool/patches/patch-ac | 52 |
2 files changed, 50 insertions, 6 deletions
diff --git a/devel/libtool/distinfo b/devel/libtool/distinfo index 8249172a8e6..674b0870f69 100644 --- a/devel/libtool/distinfo +++ b/devel/libtool/distinfo @@ -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 --git a/devel/libtool/patches/patch-ac b/devel/libtool/patches/patch-ac index 4bccf3d3336..66a36d4ddac 100644 --- a/devel/libtool/patches/patch-ac +++ b/devel/libtool/patches/patch-ac @@ -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 @@ $NetBSD: patch-ac,v 1.18 2005/05/18 11:57:12 adam Exp $ 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 @@ $NetBSD: patch-ac,v 1.18 2005/05/18 11:57:12 adam Exp $ ;; osf) -@@ -5462,8 +5516,16 @@ relink_command=\"$relink_command\"" +@@ -5462,8 +5546,16 @@ relink_command=\"$relink_command\"" exit $EXIT_FAILURE fi |