The preserve_args fragment was missing, thus the generated relink commands
were bogus.
Okay ?
Index: Makefile
===================================================================
RCS file: /cvs/ports/devel/libtool/Makefile,v
retrieving revision 1.44
diff -u -p -r1.44 Makefile
--- Makefile 2 Nov 2005 02:47:09 -0000 1.44
+++ Makefile 6 Dec 2005 19:01:26 -0000
@@ -6,7 +6,7 @@ COMMENT-ltdl= "GNU libtool system indepe
VERSION= 1.5.20
DISTNAME= libtool-${VERSION}
-PKGNAME= ${DISTNAME}p1
+PKGNAME= ${DISTNAME}p2
PKGNAME-ltdl= libltdl-${VERSION}p1
CATEGORIES= devel
MASTER_SITES= ${MASTER_SITE_GNU:=libtool/}
Index: patches/patch-ltmain_in
===================================================================
RCS file: /cvs/ports/devel/libtool/patches/patch-ltmain_in,v
retrieving revision 1.13
diff -u -p -r1.13 patch-ltmain_in
--- patches/patch-ltmain_in 2 Nov 2005 02:47:09 -0000 1.13
+++ patches/patch-ltmain_in 6 Dec 2005 19:01:26 -0000
@@ -1,7 +1,18 @@
$OpenBSD: patch-ltmain_in,v 1.13 2005/11/02 02:47:09 brad Exp $
---- ltmain.in.orig Wed Aug 31 14:25:28 2005
-+++ ltmain.in Tue Nov 1 15:13:43 2005
-@@ -1089,14 +1089,15 @@ EOF
+--- ltmain.in.orig Wed Aug 31 20:25:28 2005
++++ ltmain.in Tue Dec 6 19:57:56 2005
+@@ -468,7 +468,9 @@ do
+ preserve_args="$preserve_args $arg"
+ ;;
+
+- --tag) prevopt="--tag" prev=tag ;;
++ --tag) prevopt="--tag" prev=tag
++ preserve_args="$preserve_args --tag"
++ ;;
+ --tag=*)
+ set tag "$optarg" ${1+"$@"}
+ shift
+@@ -1089,14 +1091,15 @@ EOF
if test -n "$link_static_flag"; then
dlopen_self=$dlopen_self_static
fi
@@ -18,7 +29,7 @@ $OpenBSD: patch-ltmain_in,v 1.13 2005/11
break
;;
esac
-@@ -1984,6 +1985,17 @@ EOF
+@@ -1984,6 +1987,17 @@ EOF
;;
esac
for pass in $passes; do
@@ -36,7 +47,7 @@ $OpenBSD: patch-ltmain_in,v 1.13 2005/11
if test "$linkmode,$pass" = "lib,link" ||
test "$linkmode,$pass" = "prog,scan"; then
libs="$deplibs"
-@@ -2245,20 +2257,20 @@ EOF
+@@ -2245,20 +2259,20 @@ EOF
# It is a libtool convenience library, so add in its objects.
convenience="$convenience $ladir/$objdir/$old_library"
old_convenience="$old_convenience $ladir/$objdir/$old_library"
@@ -67,7 +78,7 @@ $OpenBSD: patch-ltmain_in,v 1.13 2005/11
continue
fi # $pass = conv
-@@ -2445,8 +2457,12 @@ EOF
+@@ -2445,8 +2459,12 @@ EOF
fi
link_static=no # Whether the deplib will be linked statically
@@ -81,7 +92,7 @@ $OpenBSD: patch-ltmain_in,v 1.13 2005/11
if test "$installed" = no; then
notinst_deplibs="$notinst_deplibs $lib"
need_relink=yes
-@@ -2644,7 +2660,7 @@ EOF
+@@ -2644,7 +2662,7 @@ EOF
add_dir=
add=
# Finalize command for both is simple: just hardcode it.
@@ -90,7 +101,7 @@ $OpenBSD: patch-ltmain_in,v 1.13 2005/11
add="$libdir/$linklib"
elif test "$hardcode_minus_L" = yes; then
add_dir="-L$libdir"
-@@ -5932,40 +5948,6 @@ relink_command=\"$relink_command\""
+@@ -5932,40 +5950,6 @@ relink_command=\"$relink_command\""
# Exit here if they wanted silent mode.
test "$show" = : && exit $EXIT_SUCCESS
