cpet/openbsd-ports
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

update to libtool 1.5.26

Browse Source 
from brad@ (maintainer)
ports build testing by naddy, ajacoutot, and me
This commit is contained in:
steven 2008-04-11 18:55:43 +00:00
parent 85d7b44762
commit 131f19e432
6 changed files with 30 additions and 121 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
devel/libtool/Makefile
View File

@ -1,14 +1,14 @@
# $OpenBSD: Makefile,v 1.68 2008/01/04 17:48:34 espie Exp $
# $OpenBSD: Makefile,v 1.69 2008/04/11 18:55:43 steven Exp $
# $FreeBSD: Makefile,v 1.2 1998/09/23 16:15:53 vanilla Exp $
COMMENT-main= generic shared library support script
COMMENT-ltdl= GNU libtool system independent dlopen wrapper
VERSION= 1.5.22
VERSION= 1.5.26
DISTNAME= libtool-${VERSION}
PKGNAME-main= ${DISTNAME}p14
PKGNAME-ltdl= libltdl-${VERSION}p3
SHARED_LIBS= ltdl 4.3
PKGNAME-main= ${DISTNAME}
PKGNAME-ltdl= libltdl-${VERSION}
SHARED_LIBS= ltdl 4.4
MODGNU_SHARED_LIBS= ltdl '-no-undefined'
CATEGORIES= devel

10
devel/libtool/distinfo
View File

@ -1,5 +1,5 @@
MD5 (libtool-1.5.22.tar.gz) = jgrJeXtiuk3Mii+3k2QSsA==
RMD160 (libtool-1.5.22.tar.gz) = fL55PuBQmQjarJKLTcOg8W9yk78=
SHA1 (libtool-1.5.22.tar.gz) = FzU+Zq6qyArhiOoKOpBglVDOMlQ=
SHA256 (libtool-1.5.22.tar.gz) = iOn/qq3iHB3a9il3I90vtMoYzK7wSZootuZy8CyM610=
SIZE (libtool-1.5.22.tar.gz) = 2921483
MD5 (libtool-1.5.26.tar.gz) = qpxRB/PsnvQgDrZVbzs8KQ==
RMD160 (libtool-1.5.26.tar.gz) = TR190DCLmOj1kHI65drduNpJrBE=
SHA1 (libtool-1.5.26.tar.gz) = TBc4NRc2ViqVGjReJPIz0AlT7Ao=
SHA256 (libtool-1.5.26.tar.gz) = HDWuNP6FqhZ716tLyfR3/gGROOGvYmeNlS/EPAt+Lwk=
SIZE (libtool-1.5.26.tar.gz) = 2961939

8
devel/libtool/patches/patch-configure
View File

@ -1,7 +1,7 @@
$OpenBSD: patch-configure,v 1.3 2006/01/07 09:58:39 brad Exp $
--- configure.orig Sun Dec 18 17:13:49 2005
+++ configure Thu Jan 5 18:11:30 2006
@@ -9282,6 +9282,13 @@ if test "$GCC" = yes; then
$OpenBSD: patch-configure,v 1.4 2008/04/11 18:55:43 steven Exp $
--- configure.orig Fri Feb 1 11:38:42 2008
+++ configure Sat Feb 2 18:45:38 2008
@@ -9574,6 +9574,13 @@ BEGIN {RS=" "; FS="/|\n";} {
else
sys_lib_search_path_spec="/lib /usr/lib /usr/local/lib"
fi

12
devel/libtool/patches/patch-libltdl_ltdl_c
View File

@ -1,12 +0,0 @@
$OpenBSD: patch-libltdl_ltdl_c,v 1.2 2007/04/14 15:58:03 espie Exp $
--- libltdl/ltdl.c.orig Mon Oct 31 20:44:43 2005
+++ libltdl/ltdl.c Sat Mar 31 13:33:59 2007
@@ -894,7 +894,7 @@ static const char sys_search_path[] = LTDL_SYSSEARCHPA
(*lt_dlmutex_seterror_func) (errormsg); \
else lt_dllast_error = (errormsg); } LT_STMT_END
#define LT_DLMUTEX_GETERROR(errormsg) LT_STMT_START { \
- if (lt_dlmutex_seterror_func) \
+ if (lt_dlmutex_geterror_func) \
(errormsg) = (*lt_dlmutex_geterror_func) (); \
else (errormsg) = lt_dllast_error; } LT_STMT_END

79
devel/libtool/patches/patch-libtool_m4
View File

@ -1,79 +0,0 @@
$OpenBSD: patch-libtool_m4,v 1.6 2007/03/25 11:36:29 matthieu Exp $
--- libtool.m4.orig Sun Dec 18 22:53:17 2005
+++ libtool.m4 Sat Mar 24 00:15:59 2007
@@ -3391,16 +3391,20 @@ case $host_os in
_LT_AC_TAGVAR(ld_shlibs, $1)=no
;;
openbsd*)
- _LT_AC_TAGVAR(hardcode_direct, $1)=yes
- _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
- _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $lib'
- _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir'
- if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
- _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-retain-symbols-file,$export_symbols -o $lib'
- _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E'
- _LT_AC_TAGVAR(whole_archive_flag_spec, $1)="$wlarc"'--whole-archive$convenience '"$wlarc"'--no-whole-archive'
+ if test -f /usr/libexec/ld.so; then
+ _LT_AC_TAGVAR(hardcode_direct, $1)=yes
+ _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
+ _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $lib'
+ _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir'
+ if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
+ _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-retain-symbols-file,$export_symbols -o $lib'
+ _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E'
+ _LT_AC_TAGVAR(whole_archive_flag_spec, $1)="$wlarc"'--whole-archive$convenience '"$wlarc"'--no-whole-archive'
+ fi
+ output_verbose_link_cmd='echo'
+ else
+ _LT_AC_TAGVAR(ld_shlibs, $1)=no
fi
- output_verbose_link_cmd='echo'
;;
osf3*)
case $cc_basename in
@@ -6012,24 +6016,28 @@ _LT_EOF
;;
openbsd*)
- _LT_AC_TAGVAR(hardcode_direct, $1)=yes
- _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
- if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
- _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags'
- _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-retain-symbols-file,$export_symbols'
- _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir'
- _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E'
+ if test -f /usr/libexec/ld.so; then
+ _LT_AC_TAGVAR(hardcode_direct, $1)=yes
+ _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
+ if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
+ _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags'
+ _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-retain-symbols-file,$export_symbols'
+ _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir'
+ _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E'
+ else
+ case $host_os in
+ openbsd[[01]].* | openbsd2.[[0-7]] | openbsd2.[[0-7]].*)
+ _LT_AC_TAGVAR(archive_cmds, $1)='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags'
+ _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir'
+ ;;
+ *)
+ _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags'
+ _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir'
+ ;;
+ esac
+ fi
else
- case $host_os in
- openbsd[[01]].* | openbsd2.[[0-7]] | openbsd2.[[0-7]].*)
- _LT_AC_TAGVAR(archive_cmds, $1)='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags'
- _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir'
- ;;
- *)
- _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags'
- _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir'
- ;;
- esac
+ _LT_AC_TAGVAR(ld_shlibs, $1)=no
fi
;;

32
devel/libtool/patches/patch-ltmain_in
View File

@ -1,7 +1,7 @@
$OpenBSD: patch-ltmain_in,v 1.26 2007/06/04 19:00:16 kurt Exp $
--- ltmain.in.orig Sun Dec 18 16:43:52 2005
+++ ltmain.in Mon May 21 22:20:24 2007
@@ -1604,6 +1604,7 @@ EOF
$OpenBSD: patch-ltmain_in,v 1.27 2008/04/11 18:55:43 steven Exp $
--- ltmain.in.orig Fri Feb 1 11:12:00 2008
+++ ltmain.in Sat Feb 2 18:45:38 2008
@@ -1651,6 +1651,7 @@ EOF
compiler_flags="$compiler_flags $arg"
compile_command="$compile_command $arg"
finalize_command="$finalize_command $arg"
@ -9,7 +9,7 @@ $OpenBSD: patch-ltmain_in,v 1.26 2007/06/04 19:00:16 kurt Exp $
continue
;;
@@ -2073,6 +2074,17 @@ EOF
@@ -2126,6 +2127,17 @@ EOF
;;
esac
for pass in $passes; do
@ -27,7 +27,7 @@ $OpenBSD: patch-ltmain_in,v 1.26 2007/06/04 19:00:16 kurt Exp $
if test "$linkmode,$pass" = "lib,link" ||
test "$linkmode,$pass" = "prog,scan"; then
libs="$deplibs"
@@ -2100,6 +2112,7 @@ EOF
@@ -2153,6 +2165,7 @@ EOF
finalize_deplibs="$deplib $finalize_deplibs"
else
compiler_flags="$compiler_flags $deplib"
@ -35,7 +35,7 @@ $OpenBSD: patch-ltmain_in,v 1.26 2007/06/04 19:00:16 kurt Exp $
fi
continue
;;
@@ -2334,20 +2347,20 @@ EOF
@@ -2392,20 +2405,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"
@ -66,7 +66,7 @@ $OpenBSD: patch-ltmain_in,v 1.26 2007/06/04 19:00:16 kurt Exp $
continue
fi # $pass = conv
@@ -2542,7 +2555,7 @@ EOF
@@ -2602,7 +2615,7 @@ EOF
{ test "$use_static_libs" = no || test -z "$old_library"; }; then
if test "$installed" = no; then
notinst_deplibs="$notinst_deplibs $lib"
@ -75,7 +75,7 @@ $OpenBSD: patch-ltmain_in,v 1.26 2007/06/04 19:00:16 kurt Exp $
fi
# This is a shared library
@@ -2741,7 +2754,7 @@ EOF
@@ -2801,7 +2814,7 @@ EOF
add_dir=
add=
# Finalize command for both is simple: just hardcode it.
@ -84,7 +84,7 @@ $OpenBSD: patch-ltmain_in,v 1.26 2007/06/04 19:00:16 kurt Exp $
add="$libdir/$linklib"
elif test "$hardcode_minus_L" = yes; then
add_dir="-L$libdir"
@@ -3359,6 +3372,20 @@ EOF
@@ -3431,6 +3444,20 @@ EOF
major=
versuffix=
verstring=""
@ -105,7 +105,7 @@ $OpenBSD: patch-ltmain_in,v 1.26 2007/06/04 19:00:16 kurt Exp $
fi
# Check to see if the archive will have undefined symbols.
@@ -5797,6 +5824,10 @@ relink_command=\"$relink_command\""
@@ -5886,6 +5913,10 @@ relink_command=\"$relink_command\""
esac
install_prog="$install_prog $arg"
done
@ -116,7 +116,7 @@ $OpenBSD: patch-ltmain_in,v 1.26 2007/06/04 19:00:16 kurt Exp $
if test -z "$install_prog"; then
$echo "$modename: you must specify an install program" 1>&2
@@ -5951,8 +5982,8 @@ relink_command=\"$relink_command\""
@@ -6040,8 +6071,8 @@ relink_command=\"$relink_command\""
test -n "$relink_command" && srcname="$realname"T
# Install the shared library and build the symlinks.
@ -127,7 +127,7 @@ $OpenBSD: patch-ltmain_in,v 1.26 2007/06/04 19:00:16 kurt Exp $
if test -n "$stripme" && test -n "$striplib"; then
$show "$striplib $destdir/$realname"
$run eval "$striplib $destdir/$realname" || exit $?
@@ -5997,8 +6028,8 @@ relink_command=\"$relink_command\""
@@ -6086,8 +6117,8 @@ relink_command=\"$relink_command\""
# Install the pseudo-library for information purposes.
name=`$echo "X$file" | $Xsed -e 's%^.*/%%'`
instname="$dir/$name"i
@ -138,7 +138,7 @@ $OpenBSD: patch-ltmain_in,v 1.26 2007/06/04 19:00:16 kurt Exp $
# Maybe install the static library, too.
test -n "$old_library" && staticlibs="$staticlibs $dir/$old_library"
@@ -6033,8 +6064,8 @@ relink_command=\"$relink_command\""
@@ -6122,8 +6153,8 @@ relink_command=\"$relink_command\""
# Install the libtool object if requested.
if test -n "$destfile"; then
@ -149,7 +149,7 @@ $OpenBSD: patch-ltmain_in,v 1.26 2007/06/04 19:00:16 kurt Exp $
fi
# Install the old object if enabled.
@@ -6042,8 +6073,8 @@ relink_command=\"$relink_command\""
@@ -6131,8 +6162,8 @@ relink_command=\"$relink_command\""
# Deduce the name of the old-style object file.
staticobj=`$echo "X$file" | $Xsed -e "$lo2o"`
@ -160,7 +160,7 @@ $OpenBSD: patch-ltmain_in,v 1.26 2007/06/04 19:00:16 kurt Exp $
fi
exit $EXIT_SUCCESS
;;
@@ -6257,40 +6288,6 @@ relink_command=\"$relink_command\""
@@ -6346,40 +6377,6 @@ relink_command=\"$relink_command\""
# Exit here if they wanted silent mode.
test "$show" = : && exit $EXIT_SUCCESS