diff options
| -rw-r--r-- | devel/libtool/files/patch-sum | 6 | ||||
| -rw-r--r-- | devel/libtool/patches/patch-aa | 8 | ||||
| -rw-r--r-- | devel/libtool/patches/patch-ab | 27 |
3 files changed, 24 insertions, 17 deletions
diff --git a/devel/libtool/files/patch-sum b/devel/libtool/files/patch-sum index 939f032db83..cf6f3979664 100644 --- a/devel/libtool/files/patch-sum +++ b/devel/libtool/files/patch-sum @@ -1,5 +1,5 @@ -$NetBSD: patch-sum,v 1.19 2001/01/14 21:43:12 scw Exp $ +$NetBSD: patch-sum,v 1.20 2001/01/15 15:18:23 jlam Exp $ -MD5 (patch-aa) = d5e53be2a96c8a9dbc916d5d3daebd3b -MD5 (patch-ab) = d77fdc1ac9ad6192679bab7afbc4a305 +MD5 (patch-aa) = 9d0fe34136ac2f00b71e535049e7ef17 +MD5 (patch-ab) = 3e33219c207d69034c7828fc007dcf55 MD5 (patch-ac) = 29c374adc4f676de414518c28d7413a3 diff --git a/devel/libtool/patches/patch-aa b/devel/libtool/patches/patch-aa index 4c3f3431c86..c73d8c2a9b9 100644 --- a/devel/libtool/patches/patch-aa +++ b/devel/libtool/patches/patch-aa @@ -1,7 +1,7 @@ -$NetBSD: patch-aa,v 1.20 2001/01/09 18:37:46 bad Exp $ +$NetBSD: patch-aa,v 1.21 2001/01/15 15:18:24 jlam Exp $ ---- ltconfig.in.orig Sat May 27 03:58:57 2000 -+++ ltconfig.in Tue Jan 9 19:21:16 2001 +--- ltconfig.in.orig Fri May 26 21:58:57 2000 ++++ ltconfig.in @@ -1095,6 +1095,13 @@ # the symbol is explicitly referenced. Since portable code cannot # rely on this symbol name, it's probably fine to never include it in @@ -10,7 +10,7 @@ $NetBSD: patch-aa,v 1.20 2001/01/09 18:37:46 bad Exp $ +# C++ startup code. +cppopts= +# option to archive_cmds that causes cpprt0 to be linked in -+ctor_check_cmd='$NM $libobjs | grep '\''___[CD]TOR_LIST__'\'' >/dev/null 2>&1' ++ctor_check_cmd='$NM $libobjs $convenience | grep '\''___[CD]TOR_LIST__'\'' >/dev/null 2>&1' + + diff --git a/devel/libtool/patches/patch-ab b/devel/libtool/patches/patch-ab index 226e57355ec..fff1616641e 100644 --- a/devel/libtool/patches/patch-ab +++ b/devel/libtool/patches/patch-ab @@ -1,7 +1,7 @@ -$NetBSD: patch-ab,v 1.13 2001/01/09 18:37:46 bad Exp $ +$NetBSD: patch-ab,v 1.14 2001/01/15 15:18:24 jlam Exp $ ---- ltmain.in.orig0 Sat May 27 03:53:15 2000 -+++ ltmain.in Tue Jan 9 19:21:17 2001 +--- ltmain.in.orig Fri May 26 21:53:15 2000 ++++ ltmain.in @@ -819,6 +819,7 @@ old_convenience= deplibs= @@ -55,13 +55,10 @@ $NetBSD: patch-ab,v 1.13 2001/01/09 18:37:46 bad Exp $ *) # Add libc to deplibs on all other systems. deplibs="$deplibs -lc" -@@ -2146,6 +2169,17 @@ - if test "$thread_safe" = yes && test -n "$thread_safe_flag_spec"; then - eval flag=\"$thread_safe_flag_spec\" - linkopts="$linkopts $flag" -+ wllinkopts="$wllinkopts $wl$flag" -+ fi -+ +@@ -2103,6 +2126,16 @@ + $run eval '$echo "X$include_expsyms" | $SP2NL >> "$export_symbols"' + fi + + # Check whether we need to link in c++rt0.o on a.out because of + # constructors/destructors + if test -n "$ctor_check_cmd"; then @@ -70,6 +67,16 @@ $NetBSD: patch-ab,v 1.13 2001/01/09 18:37:46 bad Exp $ + if $run eval "$cmd" ; then + cppopts="$cpprt0" + fi ++ fi ++ + if test -n "$convenience"; then + if test -n "$whole_archive_flag_spec"; then + eval libobjs=\"\$libobjs $whole_archive_flag_spec\" +@@ -2146,6 +2179,7 @@ + if test "$thread_safe" = yes && test -n "$thread_safe_flag_spec"; then + eval flag=\"$thread_safe_flag_spec\" + linkopts="$linkopts $flag" ++ wllinkopts="$wllinkopts $wl$flag" fi # Do each of the archive commands. |