upgrade to libtool 1.5.8
This commit is contained in:
parent
bd8e8a9327
commit
aa300b210d
@ -1,12 +1,11 @@
|
||||
# $OpenBSD: Makefile,v 1.32 2004/08/05 20:35:34 brad Exp $
|
||||
# $OpenBSD: Makefile,v 1.33 2004/08/07 21:55:26 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.6
|
||||
VERSION= 1.5.8
|
||||
DISTNAME= libtool-${VERSION}
|
||||
PKGNAME= ${DISTNAME}p1
|
||||
PKGNAME-ltdl= libltdl-${VERSION}
|
||||
CATEGORIES= devel
|
||||
MASTER_SITES= ${MASTER_SITE_GNU:=libtool/}
|
||||
|
@ -1,3 +1,3 @@
|
||||
MD5 (libtool-1.5.6.tar.gz) = f9b709f4ac6d094afdee9cdbe1c6ffe7
|
||||
RMD160 (libtool-1.5.6.tar.gz) = 379b60b9e7d9207cff68c595182c4e65dd0c0a9f
|
||||
SHA1 (libtool-1.5.6.tar.gz) = 6018b2661725e9689d7f782c5a2a489e928698ba
|
||||
MD5 (libtool-1.5.8.tar.gz) = ed04093bc9d88faa3e476ac6f4db8d50
|
||||
RMD160 (libtool-1.5.8.tar.gz) = b506aa224b0c3ed9e8e6364548b91d6e95678317
|
||||
SHA1 (libtool-1.5.8.tar.gz) = 939ad0c7745b19a1a0fa6d49baa1478b9b261758
|
||||
|
@ -1,78 +1,12 @@
|
||||
$OpenBSD: patch-acinclude_m4,v 1.3 2004/08/02 16:38:03 brad Exp $
|
||||
--- acinclude.m4.orig Sun Apr 11 01:34:51 2004
|
||||
+++ acinclude.m4 Mon Aug 2 12:34:22 2004
|
||||
@@ -676,6 +676,19 @@ AC_CACHE_VAL([lt_cv_sys_max_cmd_len], [d
|
||||
lt_cv_sys_max_cmd_len=8192;
|
||||
$OpenBSD: patch-acinclude_m4,v 1.4 2004/08/07 21:55:26 brad Exp $
|
||||
--- acinclude.m4.orig Sat Aug 7 16:57:11 2004
|
||||
+++ acinclude.m4 Sat Aug 7 16:58:08 2004
|
||||
@@ -3218,6 +3218,8 @@ case $host_os in
|
||||
_LT_AC_TAGVAR(ld_shlibs, $1)=no
|
||||
;;
|
||||
|
||||
+ netbsd* | freebsd* | openbsd* | darwin* )
|
||||
+ # This has been around since 386BSD, at least. Likely further.
|
||||
+ if test -x /sbin/sysctl; then
|
||||
+ lt_cv_sys_max_cmd_len=`/sbin/sysctl -n kern.argmax`
|
||||
+ elif test -x /usr/sbin/sysctl; then
|
||||
+ lt_cv_sys_max_cmd_len=`/usr/sbin/sysctl -n kern.argmax`
|
||||
+ else
|
||||
+ lt_cv_sys_max_cmd_len=65536 # usable default for *BSD
|
||||
+ fi
|
||||
+ # And add a safety zone
|
||||
+ lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \/ 4`
|
||||
+ ;;
|
||||
+
|
||||
*)
|
||||
# If test is not a shell built-in, we'll probably end up computing a
|
||||
# maximum length that is only half of the actual maximum length, but
|
||||
@@ -1506,7 +1519,7 @@ nto-qnx*)
|
||||
openbsd*)
|
||||
version_type=sunos
|
||||
need_lib_prefix=no
|
||||
- need_version=yes
|
||||
+ need_version=no
|
||||
library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix'
|
||||
finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir'
|
||||
shlibpath_var=LD_LIBRARY_PATH
|
||||
@@ -2214,12 +2227,10 @@ nto-qnx*)
|
||||
;;
|
||||
|
||||
openbsd*)
|
||||
- lt_cv_file_magic_cmd=/usr/bin/file
|
||||
- lt_cv_file_magic_test_file=`echo /usr/lib/libc.so.*`
|
||||
if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
|
||||
- lt_cv_deplibs_check_method='file_magic ELF [[0-9]][[0-9]]*-bit [[LM]]SB shared object'
|
||||
+ lt_cv_deplibs_check_method='match_pattern /lib[[^/]]+(\.so\.[[0-9]]+\.[[0-9]]+|\.so|_pic\.a)$'
|
||||
else
|
||||
- lt_cv_deplibs_check_method='file_magic OpenBSD.* shared library'
|
||||
+ lt_cv_deplibs_check_method='match_pattern /lib[[^/]]+(\.so\.[[0-9]]+\.[[0-9]]+|_pic\.a)$'
|
||||
fi
|
||||
;;
|
||||
|
||||
@@ -3204,6 +3215,22 @@ case $host_os in
|
||||
# Workaround some broken pre-1.5 toolchains
|
||||
output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | grep conftest.$objext | $SED -e "s:-lgcc -lc -lgcc::"'
|
||||
;;
|
||||
+ openbsd2*)
|
||||
+ # C++ shared libraries are fairly broken
|
||||
+ _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'
|
||||
+ fi
|
||||
+ output_verbose_link_cmd='echo'
|
||||
+ ;;
|
||||
osf3*)
|
||||
case $cc_basename in
|
||||
KCC)
|
||||
@@ -5572,6 +5599,7 @@ $echo "local: *; };" >> $output_objdir/$
|
||||
_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
|
||||
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
|
||||
|
@ -1,78 +1,12 @@
|
||||
$OpenBSD: patch-libltdl_acinclude_m4,v 1.3 2004/08/02 16:38:03 brad Exp $
|
||||
--- libltdl/acinclude.m4.orig Sun Apr 11 01:35:42 2004
|
||||
+++ libltdl/acinclude.m4 Mon Aug 2 12:35:01 2004
|
||||
@@ -676,6 +676,19 @@ AC_CACHE_VAL([lt_cv_sys_max_cmd_len], [d
|
||||
lt_cv_sys_max_cmd_len=8192;
|
||||
$OpenBSD: patch-libltdl_acinclude_m4,v 1.4 2004/08/07 21:55:26 brad Exp $
|
||||
--- libltdl/acinclude.m4.orig Sat Aug 7 16:58:25 2004
|
||||
+++ libltdl/acinclude.m4 Sat Aug 7 16:58:44 2004
|
||||
@@ -3218,6 +3218,8 @@ case $host_os in
|
||||
_LT_AC_TAGVAR(ld_shlibs, $1)=no
|
||||
;;
|
||||
|
||||
+ netbsd* | freebsd* | openbsd* | darwin* )
|
||||
+ # This has been around since 386BSD, at least. Likely further.
|
||||
+ if test -x /sbin/sysctl; then
|
||||
+ lt_cv_sys_max_cmd_len=`/sbin/sysctl -n kern.argmax`
|
||||
+ elif test -x /usr/sbin/sysctl; then
|
||||
+ lt_cv_sys_max_cmd_len=`/usr/sbin/sysctl -n kern.argmax`
|
||||
+ else
|
||||
+ lt_cv_sys_max_cmd_len=65536 # usable default for *BSD
|
||||
+ fi
|
||||
+ # And add a safety zone
|
||||
+ lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \/ 4`
|
||||
+ ;;
|
||||
+
|
||||
*)
|
||||
# If test is not a shell built-in, we'll probably end up computing a
|
||||
# maximum length that is only half of the actual maximum length, but
|
||||
@@ -1506,7 +1519,7 @@ nto-qnx*)
|
||||
openbsd*)
|
||||
version_type=sunos
|
||||
need_lib_prefix=no
|
||||
- need_version=yes
|
||||
+ need_version=no
|
||||
library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix'
|
||||
finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir'
|
||||
shlibpath_var=LD_LIBRARY_PATH
|
||||
@@ -2214,12 +2227,10 @@ nto-qnx*)
|
||||
;;
|
||||
|
||||
openbsd*)
|
||||
- lt_cv_file_magic_cmd=/usr/bin/file
|
||||
- lt_cv_file_magic_test_file=`echo /usr/lib/libc.so.*`
|
||||
if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
|
||||
- lt_cv_deplibs_check_method='file_magic ELF [[0-9]][[0-9]]*-bit [[LM]]SB shared object'
|
||||
+ lt_cv_deplibs_check_method='match_pattern /lib[[^/]]+(\.so\.[[0-9]]+\.[[0-9]]+|\.so|_pic\.a)$'
|
||||
else
|
||||
- lt_cv_deplibs_check_method='file_magic OpenBSD.* shared library'
|
||||
+ lt_cv_deplibs_check_method='match_pattern /lib[[^/]]+(\.so\.[[0-9]]+\.[[0-9]]+|_pic\.a)$'
|
||||
fi
|
||||
;;
|
||||
|
||||
@@ -3204,6 +3215,22 @@ case $host_os in
|
||||
# Workaround some broken pre-1.5 toolchains
|
||||
output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | grep conftest.$objext | $SED -e "s:-lgcc -lc -lgcc::"'
|
||||
;;
|
||||
+ openbsd2*)
|
||||
+ # C++ shared libraries are fairly broken
|
||||
+ _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'
|
||||
+ fi
|
||||
+ output_verbose_link_cmd='echo'
|
||||
+ ;;
|
||||
osf3*)
|
||||
case $cc_basename in
|
||||
KCC)
|
||||
@@ -5572,6 +5599,7 @@ $echo "local: *; };" >> $output_objdir/$
|
||||
_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
|
||||
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
|
||||
|
@ -1,29 +1,7 @@
|
||||
$OpenBSD: patch-libltdl_ltmain_sh,v 1.3 2004/08/05 18:04:55 brad Exp $
|
||||
--- libltdl/ltmain.sh.orig Sun Apr 11 01:44:45 2004
|
||||
+++ libltdl/ltmain.sh Tue Aug 3 21:59:58 2004
|
||||
@@ -2151,10 +2151,17 @@ EOF
|
||||
absdir="$libdir"
|
||||
fi
|
||||
else
|
||||
- dir="$ladir/$objdir"
|
||||
- absdir="$abs_ladir/$objdir"
|
||||
- # Remove this search path later
|
||||
- notinst_path="$notinst_path $abs_ladir"
|
||||
+ if test ! -f "$ladir/$objdir/$linklib" && test -f "$abs_ladir/$linklib"; then
|
||||
+ dir="$ladir"
|
||||
+ absdir="$abs_ladir"
|
||||
+ # Remove this search path later
|
||||
+ notinst_path="$notinst_path $abs_ladir"
|
||||
+ else
|
||||
+ dir="$ladir/$objdir"
|
||||
+ absdir="$abs_ladir/$objdir"
|
||||
+ # Remove this search path later
|
||||
+ notinst_path="$notinst_path $abs_ladir"
|
||||
+ fi
|
||||
fi # $installed = yes
|
||||
name=`$echo "X$laname" | $Xsed -e 's/\.la$//' -e 's/^lib//'`
|
||||
|
||||
@@ -2468,7 +2475,7 @@ EOF
|
||||
$OpenBSD: patch-libltdl_ltmain_sh,v 1.4 2004/08/07 21:55:26 brad Exp $
|
||||
--- libltdl/ltmain.sh.orig Sat Aug 7 08:12:06 2004
|
||||
+++ libltdl/ltmain.sh Sat Aug 7 17:00:48 2004
|
||||
@@ -2611,7 +2611,7 @@ EOF
|
||||
add_dir=
|
||||
add=
|
||||
# Finalize command for both is simple: just hardcode it.
|
||||
@ -32,7 +10,7 @@ $OpenBSD: patch-libltdl_ltmain_sh,v 1.3 2004/08/05 18:04:55 brad Exp $
|
||||
add="$libdir/$linklib"
|
||||
elif test "$hardcode_minus_L" = yes; then
|
||||
add_dir="-L$libdir"
|
||||
@@ -5824,40 +5831,6 @@ relink_command=\"$relink_command\""
|
||||
@@ -5804,40 +5804,6 @@ relink_command=\"$relink_command\""
|
||||
# Exit here if they wanted silent mode.
|
||||
test "$show" = : && exit $EXIT_SUCCESS
|
||||
|
||||
|
@ -1,78 +1,12 @@
|
||||
$OpenBSD: patch-libtool_m4,v 1.3 2004/08/02 16:38:03 brad Exp $
|
||||
--- libtool.m4.orig Thu Apr 1 22:46:14 2004
|
||||
+++ libtool.m4 Mon Aug 2 12:33:41 2004
|
||||
@@ -676,6 +676,19 @@ AC_CACHE_VAL([lt_cv_sys_max_cmd_len], [d
|
||||
lt_cv_sys_max_cmd_len=8192;
|
||||
$OpenBSD: patch-libtool_m4,v 1.4 2004/08/07 21:55:26 brad Exp $
|
||||
--- libtool.m4.orig Sat Aug 7 16:59:05 2004
|
||||
+++ libtool.m4 Sat Aug 7 16:59:48 2004
|
||||
@@ -3218,6 +3218,8 @@ case $host_os in
|
||||
_LT_AC_TAGVAR(ld_shlibs, $1)=no
|
||||
;;
|
||||
|
||||
+ netbsd* | freebsd* | openbsd* | darwin* )
|
||||
+ # This has been around since 386BSD, at least. Likely further.
|
||||
+ if test -x /sbin/sysctl; then
|
||||
+ lt_cv_sys_max_cmd_len=`/sbin/sysctl -n kern.argmax`
|
||||
+ elif test -x /usr/sbin/sysctl; then
|
||||
+ lt_cv_sys_max_cmd_len=`/usr/sbin/sysctl -n kern.argmax`
|
||||
+ else
|
||||
+ lt_cv_sys_max_cmd_len=65536 # usable default for *BSD
|
||||
+ fi
|
||||
+ # And add a safety zone
|
||||
+ lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \/ 4`
|
||||
+ ;;
|
||||
+
|
||||
*)
|
||||
# If test is not a shell built-in, we'll probably end up computing a
|
||||
# maximum length that is only half of the actual maximum length, but
|
||||
@@ -1506,7 +1519,7 @@ nto-qnx*)
|
||||
openbsd*)
|
||||
version_type=sunos
|
||||
need_lib_prefix=no
|
||||
- need_version=yes
|
||||
+ need_version=no
|
||||
library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix'
|
||||
finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir'
|
||||
shlibpath_var=LD_LIBRARY_PATH
|
||||
@@ -2214,12 +2227,10 @@ nto-qnx*)
|
||||
;;
|
||||
|
||||
openbsd*)
|
||||
- lt_cv_file_magic_cmd=/usr/bin/file
|
||||
- lt_cv_file_magic_test_file=`echo /usr/lib/libc.so.*`
|
||||
if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
|
||||
- lt_cv_deplibs_check_method='file_magic ELF [[0-9]][[0-9]]*-bit [[LM]]SB shared object'
|
||||
+ lt_cv_deplibs_check_method='match_pattern /lib[[^/]]+(\.so\.[[0-9]]+\.[[0-9]]+|\.so|_pic\.a)$'
|
||||
else
|
||||
- lt_cv_deplibs_check_method='file_magic OpenBSD.* shared library'
|
||||
+ lt_cv_deplibs_check_method='match_pattern /lib[[^/]]+(\.so\.[[0-9]]+\.[[0-9]]+|_pic\.a)$'
|
||||
fi
|
||||
;;
|
||||
|
||||
@@ -3204,6 +3215,22 @@ case $host_os in
|
||||
# Workaround some broken pre-1.5 toolchains
|
||||
output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | grep conftest.$objext | $SED -e "s:-lgcc -lc -lgcc::"'
|
||||
;;
|
||||
+ openbsd2*)
|
||||
+ # C++ shared libraries are fairly broken
|
||||
+ _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'
|
||||
+ fi
|
||||
+ output_verbose_link_cmd='echo'
|
||||
+ ;;
|
||||
osf3*)
|
||||
case $cc_basename in
|
||||
KCC)
|
||||
@@ -5572,6 +5599,7 @@ $echo "local: *; };" >> $output_objdir/$
|
||||
_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
|
||||
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
|
||||
|
@ -1,29 +1,7 @@
|
||||
$OpenBSD: patch-ltmain_in,v 1.3 2004/08/05 18:04:55 brad Exp $
|
||||
--- ltmain.in.orig Thu Apr 1 22:46:15 2004
|
||||
+++ ltmain.in Tue Aug 3 21:58:08 2004
|
||||
@@ -2151,10 +2151,17 @@ EOF
|
||||
absdir="$libdir"
|
||||
fi
|
||||
else
|
||||
- dir="$ladir/$objdir"
|
||||
- absdir="$abs_ladir/$objdir"
|
||||
- # Remove this search path later
|
||||
- notinst_path="$notinst_path $abs_ladir"
|
||||
+ if test ! -f "$ladir/$objdir/$linklib" && test -f "$abs_ladir/$linklib"; then
|
||||
+ dir="$ladir"
|
||||
+ absdir="$abs_ladir"
|
||||
+ # Remove this search path later
|
||||
+ notinst_path="$notinst_path $abs_ladir"
|
||||
+ else
|
||||
+ dir="$ladir/$objdir"
|
||||
+ absdir="$abs_ladir/$objdir"
|
||||
+ # Remove this search path later
|
||||
+ notinst_path="$notinst_path $abs_ladir"
|
||||
+ fi
|
||||
fi # $installed = yes
|
||||
name=`$echo "X$laname" | $Xsed -e 's/\.la$//' -e 's/^lib//'`
|
||||
|
||||
@@ -2468,7 +2475,7 @@ EOF
|
||||
$OpenBSD: patch-ltmain_in,v 1.4 2004/08/07 21:55:26 brad Exp $
|
||||
--- ltmain.in.orig Tue Aug 3 00:49:02 2004
|
||||
+++ ltmain.in Sat Aug 7 17:00:56 2004
|
||||
@@ -2611,7 +2611,7 @@ EOF
|
||||
add_dir=
|
||||
add=
|
||||
# Finalize command for both is simple: just hardcode it.
|
||||
@ -32,7 +10,7 @@ $OpenBSD: patch-ltmain_in,v 1.3 2004/08/05 18:04:55 brad Exp $
|
||||
add="$libdir/$linklib"
|
||||
elif test "$hardcode_minus_L" = yes; then
|
||||
add_dir="-L$libdir"
|
||||
@@ -5824,40 +5831,6 @@ relink_command=\"$relink_command\""
|
||||
@@ -5804,40 +5804,6 @@ relink_command=\"$relink_command\""
|
||||
# Exit here if they wanted silent mode.
|
||||
test "$show" = : && exit $EXIT_SUCCESS
|
||||
|
||||
|
@ -1,3 +1,2 @@
|
||||
@comment $OpenBSD: PFRAG.shared-ltdl,v 1.1 2004/07/02 01:59:12 brad Exp $
|
||||
lib/libltdl.so.4.0
|
||||
DYNLIBDIR(%D/lib)
|
||||
@comment $OpenBSD: PFRAG.shared-ltdl,v 1.2 2004/08/07 21:55:26 brad Exp $
|
||||
@lib lib/libltdl.so.4.0
|
||||
|
@ -1,12 +1,9 @@
|
||||
@comment $OpenBSD: PLIST,v 1.8 2004/07/02 01:59:12 brad Exp $
|
||||
@comment $OpenBSD: PLIST,v 1.9 2004/08/07 21:55:26 brad Exp $
|
||||
bin/libtool
|
||||
bin/libtoolize
|
||||
@unexec install-info --delete --info-dir=%D/info %D/info/libtool.info
|
||||
info/libtool.info
|
||||
@exec install-info --info-dir=%D/info %D/info/libtool.info
|
||||
@info info/libtool.info
|
||||
@comment share/aclocal/
|
||||
share/aclocal/libtool.m4
|
||||
share/libtool/config.guess
|
||||
share/libtool/config.sub
|
||||
share/libtool/ltmain.sh
|
||||
@dirrm share/libtool
|
||||
@dirrm share/aclocal
|
||||
|
@ -1,9 +1,10 @@
|
||||
@comment $OpenBSD: PLIST-ltdl,v 1.1 2004/07/02 01:59:12 brad Exp $
|
||||
@comment $OpenBSD: PLIST-ltdl,v 1.2 2004/08/07 21:55:26 brad Exp $
|
||||
include/ltdl.h
|
||||
lib/libltdl.a
|
||||
lib/libltdl.la
|
||||
%%SHARED%%
|
||||
share/aclocal/ltdl.m4
|
||||
share/libtool/
|
||||
share/libtool/libltdl/
|
||||
share/libtool/libltdl/COPYING.LIB
|
||||
share/libtool/libltdl/Makefile.am
|
||||
share/libtool/libltdl/Makefile.in
|
||||
@ -20,5 +21,4 @@ share/libtool/libltdl/ltdl.c
|
||||
share/libtool/libltdl/ltdl.h
|
||||
share/libtool/libltdl/ltmain.sh
|
||||
share/libtool/libltdl/missing
|
||||
@dirrm share/libtool/libltdl
|
||||
@dirrm share/libtool
|
||||
%%SHARED%%
|
||||
|
Loading…
Reference in New Issue
Block a user