libtool-base 1.5.18nb4: Fix a really nasty bug on Interix;

hardcode_libdir_flag_spec used -h rather than the correct -rpath.

Fix provided in private mail by Thorsten Glaser.

5 files changed, 17 insertions, 17 deletions

diff --git a/devel/libtool-base/Makefile b/devel/libtool-base/Makefile
index 0d682854bac..436813ff684 100644
--- a/devel/libtool-base/Makefile
+++ b/devel/libtool-base/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.68 2005/06/05 18:04:37 tv Exp $
+# $NetBSD: Makefile,v 1.69 2005/07/03 19:01:51 tv Exp $
 
 ###########################################################################
 ###########################################################################
@@ -26,7 +26,7 @@
 .include "../../devel/libtool/Makefile.common"
 
 PKGNAME=	${DISTNAME:S/-/-base-/}
-PKGREVISION=	3
+PKGREVISION=	4
 SVR4_PKGNAME=	ltoob
 
 COMMENT=	Generic shared library support script (the script itself)
diff --git a/devel/libtool/distinfo b/devel/libtool/distinfo
index 674b0870f69..02898e655ef 100644
--- a/devel/libtool/distinfo
+++ b/devel/libtool/distinfo
@@ -1,9 +1,9 @@
-$NetBSD: distinfo,v 1.60 2005/06/05 18:04:37 tv Exp $
+$NetBSD: distinfo,v 1.61 2005/07/03 19:01:50 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-ab) = 65dfc7282ea322b6c372ff7532ed3f81f8918a97
 SHA1 (patch-ac) = e7a067d002f7948361e2e90862cb96c6bba1959d
-SHA1 (patch-ad) = 46fdc723421a2b3198bcbaa95eafc89441465544
+SHA1 (patch-ad) = 23784e97c5cf4f6e7d90d3c4ee829379ae3ef408
diff --git a/devel/libtool/patches/manual-libtool.m4 b/devel/libtool/patches/manual-libtool.m4
index 1dd3921fcbc..50e765b33d3 100644
--- a/devel/libtool/patches/manual-libtool.m4
+++ b/devel/libtool/patches/manual-libtool.m4
@@ -1,4 +1,4 @@
-$NetBSD: manual-libtool.m4,v 1.14 2005/05/18 14:40:04 tv Exp $
+$NetBSD: manual-libtool.m4,v 1.15 2005/07/03 19:01:50 tv Exp $
 
 --- libtool.m4.orig	2005-05-15 09:41:23.000000000 -0400
 +++ libtool.m4
@@ -342,7 +342,7 @@ $NetBSD: manual-libtool.m4,v 1.14 2005/05/18 14:40:04 tv Exp $
 +      _LT_AC_TAGVAR(archive_expsym_cmds, $1)='sed s,^,_, $export_symbols >$output_objdir/$soname.exp && $CC -shared $libobjs $deplibs $compiler_flags ${wl}-h,$soname ${wl}--retain-symbols-file $wl$output_objdir/$soname ${wl}--image-base,$(($RANDOM %4096/2*262144+1342177280)) -o $lib'
 +      _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E'
 +      _LT_AC_TAGVAR(hardcode_direct, $1)=yes
-+      _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-h,$libdir'
++      _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir'
 +      _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
 +      ;;
 +
diff --git a/devel/libtool/patches/patch-ab b/devel/libtool/patches/patch-ab
index b71d5efa6b3..beae08809a6 100644
--- a/devel/libtool/patches/patch-ab
+++ b/devel/libtool/patches/patch-ab
@@ -1,6 +1,6 @@
-$NetBSD: patch-ab,v 1.52 2005/05/18 14:40:04 tv Exp $
+$NetBSD: patch-ab,v 1.53 2005/07/03 19:01:50 tv Exp $
 
---- configure.orig	2005-05-18 09:53:15.000000000 -0400
+--- configure.orig	2005-07-03 14:55:24.000000000 -0400
 +++ configure
 @@ -322,11 +322,11 @@ else
  
@@ -306,7 +306,7 @@ $NetBSD: patch-ab,v 1.52 2005/05/18 14:40:04 tv Exp $
 +      archive_expsym_cmds='sed s,^,_, $export_symbols >$output_objdir/$soname.exp && $CC -shared $libobjs $deplibs $compiler_flags ${wl}-h,$soname ${wl}--retain-symbols-file $wl$output_objdir/$soname ${wl}--image-base,$(($RANDOM %4096/2*262144+1342177280)) -o $lib'
 +      export_dynamic_flag_spec='${wl}-E'
 +      hardcode_direct=yes
-+      hardcode_libdir_flag_spec='${wl}-h,$libdir'
++      hardcode_libdir_flag_spec='${wl}-rpath,$libdir'
 +      hardcode_shlibpath_var=no
 +      ;;
 +
@@ -866,7 +866,7 @@ $NetBSD: patch-ab,v 1.52 2005/05/18 14:40:04 tv Exp $
 +      archive_expsym_cmds_F77='sed s,^,_, $export_symbols >$output_objdir/$soname.exp && $CC -shared $libobjs $deplibs $compiler_flags ${wl}-h,$soname ${wl}--retain-symbols-file $wl$output_objdir/$soname ${wl}--image-base,$(($RANDOM %4096/2*262144+1342177280)) -o $lib'
 +      export_dynamic_flag_spec_F77='${wl}-E'
 +      hardcode_direct_F77=yes
-+      hardcode_libdir_flag_spec_F77='${wl}-h,$libdir'
++      hardcode_libdir_flag_spec_F77='${wl}-rpath,$libdir'
 +      hardcode_shlibpath_var_F77=no
 +      ;;
 +
@@ -1051,7 +1051,7 @@ $NetBSD: patch-ab,v 1.52 2005/05/18 14:40:04 tv Exp $
 +      archive_expsym_cmds_GCJ='sed s,^,_, $export_symbols >$output_objdir/$soname.exp && $CC -shared $libobjs $deplibs $compiler_flags ${wl}-h,$soname ${wl}--retain-symbols-file $wl$output_objdir/$soname ${wl}--image-base,$(($RANDOM %4096/2*262144+1342177280)) -o $lib'
 +      export_dynamic_flag_spec_GCJ='${wl}-E'
 +      hardcode_direct_GCJ=yes
-+      hardcode_libdir_flag_spec_GCJ='${wl}-h,$libdir'
++      hardcode_libdir_flag_spec_GCJ='${wl}-rpath,$libdir'
 +      hardcode_shlibpath_var_GCJ=no
 +      ;;
 +
diff --git a/devel/libtool/patches/patch-ad b/devel/libtool/patches/patch-ad
index 4b95ec4d99e..eefbeb506e9 100644
--- a/devel/libtool/patches/patch-ad
+++ b/devel/libtool/patches/patch-ad
@@ -1,6 +1,6 @@
-$NetBSD: patch-ad,v 1.24 2005/05/18 14:40:04 tv Exp $
+$NetBSD: patch-ad,v 1.25 2005/07/03 19:01:51 tv Exp $
 
---- libltdl/configure.orig	2005-05-18 09:53:15.000000000 -0400
+--- libltdl/configure.orig	2005-07-03 14:55:24.000000000 -0400
 +++ libltdl/configure
 @@ -322,11 +322,11 @@ else
  
@@ -326,7 +326,7 @@ $NetBSD: patch-ad,v 1.24 2005/05/18 14:40:04 tv Exp $
 +      archive_expsym_cmds='sed s,^,_, $export_symbols >$output_objdir/$soname.exp && $CC -shared $libobjs $deplibs $compiler_flags ${wl}-h,$soname ${wl}--retain-symbols-file $wl$output_objdir/$soname ${wl}--image-base,$(($RANDOM %4096/2*262144+1342177280)) -o $lib'
 +      export_dynamic_flag_spec='${wl}-E'
 +      hardcode_direct=yes
-+      hardcode_libdir_flag_spec='${wl}-h,$libdir'
++      hardcode_libdir_flag_spec='${wl}-rpath,$libdir'
 +      hardcode_shlibpath_var=no
 +      ;;
 +
@@ -886,7 +886,7 @@ $NetBSD: patch-ad,v 1.24 2005/05/18 14:40:04 tv Exp $
 +      archive_expsym_cmds_F77='sed s,^,_, $export_symbols >$output_objdir/$soname.exp && $CC -shared $libobjs $deplibs $compiler_flags ${wl}-h,$soname ${wl}--retain-symbols-file $wl$output_objdir/$soname ${wl}--image-base,$(($RANDOM %4096/2*262144+1342177280)) -o $lib'
 +      export_dynamic_flag_spec_F77='${wl}-E'
 +      hardcode_direct_F77=yes
-+      hardcode_libdir_flag_spec_F77='${wl}-h,$libdir'
++      hardcode_libdir_flag_spec_F77='${wl}-rpath,$libdir'
 +      hardcode_shlibpath_var_F77=no
 +      ;;
 +
@@ -1071,7 +1071,7 @@ $NetBSD: patch-ad,v 1.24 2005/05/18 14:40:04 tv Exp $
 +      archive_expsym_cmds_GCJ='sed s,^,_, $export_symbols >$output_objdir/$soname.exp && $CC -shared $libobjs $deplibs $compiler_flags ${wl}-h,$soname ${wl}--retain-symbols-file $wl$output_objdir/$soname ${wl}--image-base,$(($RANDOM %4096/2*262144+1342177280)) -o $lib'
 +      export_dynamic_flag_spec_GCJ='${wl}-E'
 +      hardcode_direct_GCJ=yes
-+      hardcode_libdir_flag_spec_GCJ='${wl}-h,$libdir'
++      hardcode_libdir_flag_spec_GCJ='${wl}-rpath,$libdir'
 +      hardcode_shlibpath_var_GCJ=no
 +      ;;
 +