upgrade to libtool 1.5.16

This commit is contained in:
brad 2005-05-21 22:38:19 +00:00
parent 912a7cbc47
commit e127e8d5c0
4 changed files with 20 additions and 80 deletions

View File

@ -1,10 +1,10 @@
# $OpenBSD: Makefile,v 1.38 2005/04/17 10:14:55 brad Exp $
# $OpenBSD: Makefile,v 1.39 2005/05/21 22:38:19 brad Exp $
# $FreeBSD: Makefile,v 1.2 1998/09/23 16:15:53 vanilla Exp $
COMMENT= "generic shared library support script"
COMMENT-ltdl= "GNU libtool system independent dlopen wrapper"
VERSION= 1.5.14
VERSION= 1.5.16
DISTNAME= libtool-${VERSION}
PKGNAME-ltdl= libltdl-${VERSION}
CATEGORIES= devel

View File

@ -1,4 +1,4 @@
MD5 (libtool-1.5.14.tar.gz) = 049bf67de9b0eb75cd943dafe3d749ec
RMD160 (libtool-1.5.14.tar.gz) = f26606366a76a5703929ed1785f745f69bceb8c6
SHA1 (libtool-1.5.14.tar.gz) = 0c8935aa80cd5532aa8e5462157cc07ae26a3862
SIZE (libtool-1.5.14.tar.gz) = 2732031
MD5 (libtool-1.5.16.tar.gz) = 5f3c344ae62a1d1fd789877e8080ae57
RMD160 (libtool-1.5.16.tar.gz) = c73749df01145f7ecafa388cd5f6dd38e085c202
SHA1 (libtool-1.5.16.tar.gz) = 8343e980f55855db5a3a99a3edaada8a80aef81f
SIZE (libtool-1.5.16.tar.gz) = 2774942

View File

@ -1,19 +1,7 @@
$OpenBSD: patch-libltdl_ltmain_sh,v 1.7 2005/04/17 10:14:55 brad Exp $
--- libltdl/ltmain.sh.orig Sat Feb 12 07:30:57 2005
+++ libltdl/ltmain.sh Sun Apr 17 05:40:47 2005
@@ -112,8 +112,9 @@ if test "${LANG+set}" = set; then
fi
# Make sure IFS has a sensible default
-: ${IFS="
-"}
+lt_nl='
+'
+IFS=" $lt_nl"
if test "$build_libtool_libs" != yes && test "$build_old_libs" != yes; then
$echo "$modename: not configured to build any kind of library" 1>&2
@@ -1989,6 +1990,17 @@ EOF
$OpenBSD: patch-libltdl_ltmain_sh,v 1.8 2005/05/21 22:38:19 brad Exp $
--- libltdl/ltmain.sh.orig Sun Apr 24 13:59:20 2005
+++ libltdl/ltmain.sh Fri May 13 21:09:30 2005
@@ -1981,6 +1981,17 @@ EOF
;;
esac
for pass in $passes; do
@ -31,7 +19,7 @@ $OpenBSD: patch-libltdl_ltmain_sh,v 1.7 2005/04/17 10:14:55 brad Exp $
if test "$linkmode,$pass" = "lib,link" ||
test "$linkmode,$pass" = "prog,scan"; then
libs="$deplibs"
@@ -2250,20 +2262,20 @@ EOF
@@ -2242,20 +2253,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"
@ -62,7 +50,7 @@ $OpenBSD: patch-libltdl_ltmain_sh,v 1.7 2005/04/17 10:14:55 brad Exp $
continue
fi # $pass = conv
@@ -2649,7 +2661,7 @@ EOF
@@ -2641,7 +2652,7 @@ EOF
add_dir=
add=
# Finalize command for both is simple: just hardcode it.
@ -71,25 +59,7 @@ $OpenBSD: patch-libltdl_ltmain_sh,v 1.7 2005/04/17 10:14:55 brad Exp $
add="$libdir/$linklib"
elif test "$hardcode_minus_L" = yes; then
add_dir="-L$libdir"
@@ -2852,13 +2864,13 @@ EOF
*) continue ;;
esac
case " $deplibs " in
+ *" $path "*) ;;
+ *) deplibs="$path $deplibs" ;;
+ esac
+ case " $deplibs " in
*" $depdepl "*) ;;
*) deplibs="$depdepl $deplibs" ;;
esac
- case " $deplibs " in
- *" $path "*) ;;
- *) deplibs="$deplibs $path" ;;
- esac
done
fi # link_all_deplibs != no
fi # linkmode = lib
@@ -5862,40 +5874,6 @@ relink_command=\"$relink_command\""
@@ -5898,40 +5909,6 @@ relink_command=\"$relink_command\""
# Exit here if they wanted silent mode.
test "$show" = : && exit $EXIT_SUCCESS

View File

@ -1,19 +1,7 @@
$OpenBSD: patch-ltmain_in,v 1.7 2005/04/17 10:14:55 brad Exp $
--- ltmain.in.orig Sat Feb 12 07:18:34 2005
+++ ltmain.in Sun Apr 17 05:35:06 2005
@@ -112,8 +112,9 @@ if test "${LANG+set}" = set; then
fi
# Make sure IFS has a sensible default
-: ${IFS="
-"}
+lt_nl='
+'
+IFS=" $lt_nl"
if test "$build_libtool_libs" != yes && test "$build_old_libs" != yes; then
$echo "$modename: not configured to build any kind of library" 1>&2
@@ -1989,6 +1990,17 @@ EOF
$OpenBSD: patch-ltmain_in,v 1.8 2005/05/21 22:38:19 brad Exp $
--- ltmain.in.orig Sat Apr 23 01:39:19 2005
+++ ltmain.in Fri May 13 21:11:17 2005
@@ -1981,6 +1981,17 @@ EOF
;;
esac
for pass in $passes; do
@ -31,7 +19,7 @@ $OpenBSD: patch-ltmain_in,v 1.7 2005/04/17 10:14:55 brad Exp $
if test "$linkmode,$pass" = "lib,link" ||
test "$linkmode,$pass" = "prog,scan"; then
libs="$deplibs"
@@ -2250,20 +2262,20 @@ EOF
@@ -2242,20 +2253,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"
@ -62,7 +50,7 @@ $OpenBSD: patch-ltmain_in,v 1.7 2005/04/17 10:14:55 brad Exp $
continue
fi # $pass = conv
@@ -2649,7 +2661,7 @@ EOF
@@ -2641,7 +2652,7 @@ EOF
add_dir=
add=
# Finalize command for both is simple: just hardcode it.
@ -71,25 +59,7 @@ $OpenBSD: patch-ltmain_in,v 1.7 2005/04/17 10:14:55 brad Exp $
add="$libdir/$linklib"
elif test "$hardcode_minus_L" = yes; then
add_dir="-L$libdir"
@@ -2852,13 +2864,13 @@ EOF
*) continue ;;
esac
case " $deplibs " in
+ *" $path "*) ;;
+ *) deplibs="$path $deplibs" ;;
+ esac
+ case " $deplibs " in
*" $depdepl "*) ;;
*) deplibs="$depdepl $deplibs" ;;
esac
- case " $deplibs " in
- *" $path "*) ;;
- *) deplibs="$deplibs $path" ;;
- esac
done
fi # link_all_deplibs != no
fi # linkmode = lib
@@ -5862,40 +5874,6 @@ relink_command=\"$relink_command\""
@@ -5898,40 +5909,6 @@ relink_command=\"$relink_command\""
# Exit here if they wanted silent mode.
test "$show" = : && exit $EXIT_SUCCESS