summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--devel/libtool-base/Makefile3
-rw-r--r--devel/libtool/Makefile.common4
-rw-r--r--devel/libtool/distinfo6
-rw-r--r--devel/libtool/patches/manual-libtool.m492
-rw-r--r--devel/libtool/patches/patch-ab194
-rw-r--r--devel/libtool/patches/patch-ad200
6 files changed, 300 insertions, 199 deletions
diff --git a/devel/libtool-base/Makefile b/devel/libtool-base/Makefile
index 6b20f9bd765..842c8683679 100644
--- a/devel/libtool-base/Makefile
+++ b/devel/libtool-base/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.85 2008/11/19 07:50:55 wiz Exp $
+# $NetBSD: Makefile,v 1.86 2009/03/23 23:03:59 joerg Exp $
###########################################################################
###########################################################################
@@ -26,6 +26,7 @@
.include "../../devel/libtool/Makefile.common"
PKGNAME= ${DISTNAME:S/-/-base-/}
+PKGREVISION= 1
SVR4_PKGNAME= ltoob
COMMENT= Generic shared library support script (the script itself)
diff --git a/devel/libtool/Makefile.common b/devel/libtool/Makefile.common
index e743c239089..13f2054f60d 100644
--- a/devel/libtool/Makefile.common
+++ b/devel/libtool/Makefile.common
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.73 2008/11/19 01:26:52 chuck Exp $
+# $NetBSD: Makefile.common,v 1.74 2009/03/23 23:03:58 joerg Exp $
###########################################################################
###########################################################################
@@ -27,7 +27,7 @@ DISTNAME= libtool-1.5.26
CATEGORIES= devel pkgtools
MASTER_SITES= ${MASTER_SITE_GNU:=libtool/}
-MAINTAINER= joerg@NetBSD.org
+OWNER= joerg@NetBSD.org
HOMEPAGE= http://www.gnu.org/software/libtool/libtool.html
#LICENSE= gnu-gpl-v2
diff --git a/devel/libtool/distinfo b/devel/libtool/distinfo
index 287aa8083fc..3db68891f49 100644
--- a/devel/libtool/distinfo
+++ b/devel/libtool/distinfo
@@ -1,9 +1,9 @@
-$NetBSD: distinfo,v 1.72 2008/11/19 01:26:52 chuck Exp $
+$NetBSD: distinfo,v 1.73 2009/03/23 23:03:59 joerg Exp $
SHA1 (libtool-1.5.26.tar.gz) = 4c1738351736562a951a345e24f233d00953ec0a
RMD160 (libtool-1.5.26.tar.gz) = 4d1d7dd0308b98e8f590723ae5daddb8da49ac11
Size (libtool-1.5.26.tar.gz) = 2961939 bytes
SHA1 (patch-aa) = 4c979de3439dfffa48295e094c1aee40c7e79fa6
-SHA1 (patch-ab) = 4b3befd3cf5629e3b46b4bd100b697d10089d434
+SHA1 (patch-ab) = 9902ccf15b031d04fdca95acbf718a849c6d0a4f
SHA1 (patch-ac) = 52f22f3f7a58e22d2240d0c6bb77455783ee5d70
-SHA1 (patch-ad) = d3636017fc09a571df6ecb57b7b988867bbbd4ce
+SHA1 (patch-ad) = e3e3164b1e9598deab233450a1f7a8262dd09d66
diff --git a/devel/libtool/patches/manual-libtool.m4 b/devel/libtool/patches/manual-libtool.m4
index ffd16d22c24..94df076dc6a 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.24 2009/02/24 10:13:26 abs Exp $
+$NetBSD: manual-libtool.m4,v 1.25 2009/03/23 23:03:59 joerg Exp $
Local pkgsrc changes:
- override the basename to point to the actual backend compiler,
@@ -8,10 +8,11 @@ Local pkgsrc changes:
- QNX support
- Interix3 support
- disable static linkage on OS X by default
+- DragonFly support decoupled from FreeBSD
---- libtool.m4.orig 2008-02-01 16:26:47.000000000 +0000
-+++ libtool.m4 2009-02-21 23:20:30.000000000 +0000
-@@ -249,7 +249,10 @@
+--- libtool.m4.orig 2008-02-01 17:26:47.000000000 +0100
++++ libtool.m4
+@@ -249,7 +249,10 @@ AC_DEFUN([_LT_CC_BASENAME],
*) break;;
esac
done
@@ -23,7 +24,7 @@ Local pkgsrc changes:
])
-@@ -474,11 +477,11 @@
+@@ -474,11 +477,11 @@ else
if test "X$echo" = Xecho; then
# We didn't find a better echo, so look for alternatives.
@@ -37,7 +38,7 @@ Local pkgsrc changes:
elif (test -f /bin/ksh || test -f /bin/ksh$ac_exeext) &&
test "X$CONFIG_SHELL" != X/bin/ksh; then
# If we have ksh, try running configure again with it.
-@@ -820,6 +823,13 @@
+@@ -820,6 +823,13 @@ AC_CACHE_VAL([lt_cv_sys_max_cmd_len], [d
lt_cv_sys_max_cmd_len=8192;
;;
@@ -51,7 +52,7 @@ Local pkgsrc changes:
amigaos*)
# On AmigaOS with pdksh, this test takes hours, literally.
# So we just punt and use a minimum line length of 8192.
-@@ -1427,6 +1437,7 @@
+@@ -1427,6 +1437,7 @@ beos*)
bsdi[[45]]*)
version_type=linux
need_version=no
@@ -59,16 +60,18 @@ Local pkgsrc changes:
library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
soname_spec='${libname}${release}${shared_ext}$major'
finish_cmds='PATH="\$PATH:/sbin" ldconfig $libdir'
-@@ -1525,7 +1536,7 @@
+@@ -1525,9 +1536,7 @@ freebsd1*)
dynamic_linker=no
;;
-freebsd* | dragonfly*)
+- # DragonFly does not have aout. When/if they implement a new
+- # versioning mechanism, adjust this.
+freebsd*)
- # DragonFly does not have aout. When/if they implement a new
- # versioning mechanism, adjust this.
if test -x /usr/bin/objformat; then
-@@ -1539,7 +1550,7 @@
+ objformat=`/usr/bin/objformat`
+ else
+@@ -1539,7 +1548,7 @@ freebsd* | dragonfly*)
version_type=freebsd-$objformat
case $version_type in
freebsd-elf*)
@@ -77,15 +80,24 @@ Local pkgsrc changes:
need_version=no
need_lib_prefix=no
;;
-@@ -1569,6 +1580,16 @@
+@@ -1562,13 +1571,24 @@ freebsd* | dragonfly*)
+ shlibpath_overrides_runpath=no
+ hardcode_into_libs=yes
+ ;;
+- *) # from 4.6 on, and DragonFly
++ *) # from 4.6 on
+ shlibpath_overrides_runpath=yes
+ hardcode_into_libs=yes
+ ;;
esac
;;
+dragonfly*)
-+ version_type=linux # XXX tv this should be =linux; current selection has problems
++ version_type=linux
+ need_version=no
+ need_lib_prefix=no
+ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}'
++ soname_spec='${libname}${release}${shared_ext}$major'
+ shlibpath_var=LD_LIBRARY_PATH
+ shlibpath_overrides_runpath=no
+ hardcode_into_libs=yes
@@ -94,7 +106,7 @@ Local pkgsrc changes:
gnu*)
version_type=linux
need_lib_prefix=no
-@@ -1637,15 +1658,22 @@
+@@ -1637,15 +1657,22 @@ interix[[3-9]]*)
hardcode_into_libs=yes
;;
@@ -123,7 +135,7 @@ Local pkgsrc changes:
esac
need_lib_prefix=no
need_version=no
-@@ -1710,11 +1738,11 @@
+@@ -1710,11 +1737,11 @@ linux* | k*bsd*-gnu)
;;
netbsd*)
@@ -137,7 +149,7 @@ Local pkgsrc changes:
finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir'
dynamic_linker='NetBSD (a.out) ld.so'
else
-@@ -1739,13 +1767,14 @@
+@@ -1739,13 +1766,14 @@ nto-qnx*)
need_lib_prefix=no
need_version=no
library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
@@ -153,7 +165,7 @@ Local pkgsrc changes:
sys_lib_dlsearch_path_spec="/usr/lib"
need_lib_prefix=no
# Some older versions of OpenBSD (3.3 at least) *do* need versioned libs.
-@@ -1753,7 +1782,7 @@
+@@ -1753,7 +1781,7 @@ openbsd*)
openbsd3.3 | openbsd3.3.*) need_version=yes ;;
*) need_version=no ;;
esac
@@ -162,7 +174,7 @@ Local pkgsrc changes:
finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir'
shlibpath_var=LD_LIBRARY_PATH
if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
-@@ -1954,9 +1983,7 @@
+@@ -1954,9 +1982,7 @@ if test -f "$ltmain" && test -n "$tagnam
case $tagname in
CXX)
@@ -173,7 +185,7 @@ Local pkgsrc changes:
AC_LIBTOOL_LANG_CXX_CONFIG
else
tagname=""
-@@ -2475,6 +2502,10 @@
+@@ -2475,6 +2501,10 @@ interix[[3-9]]*)
lt_cv_deplibs_check_method='match_pattern /lib[[^/]]+(\.so|\.a)$'
;;
@@ -184,7 +196,7 @@ Local pkgsrc changes:
irix5* | irix6* | nonstopux*)
case $LD in
*-32|*"-32 ") libmagic=32-bit;;
-@@ -2505,7 +2536,7 @@
+@@ -2505,7 +2535,7 @@ newos6*)
;;
nto-qnx*)
@@ -193,7 +205,7 @@ Local pkgsrc changes:
;;
openbsd*)
-@@ -2712,21 +2743,10 @@
+@@ -2712,21 +2742,10 @@ AC_DEFUN([AC_LIBTOOL_CXX],
# ---------------
AC_DEFUN([_LT_AC_LANG_CXX],
[AC_REQUIRE([AC_PROG_CXX])
@@ -216,7 +228,7 @@ Local pkgsrc changes:
# AC_LIBTOOL_F77
# --------------
-@@ -2864,7 +2884,7 @@
+@@ -2864,7 +2883,7 @@ AC_DEFUN([AC_LIBTOOL_LANG_CXX_CONFIG], [
AC_DEFUN([_LT_AC_LANG_CXX_CONFIG],
[AC_LANG_PUSH(C++)
AC_REQUIRE([AC_PROG_CXX])
@@ -225,7 +237,7 @@ Local pkgsrc changes:
_LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no
_LT_AC_TAGVAR(allow_undefined_flag, $1)=
-@@ -3350,6 +3370,16 @@
+@@ -3350,6 +3369,16 @@ case $host_os in
_LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-h,$soname ${wl}--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib'
_LT_AC_TAGVAR(archive_expsym_cmds, $1)='sed "s,^,_," $export_symbols >$output_objdir/$soname.expsym~$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-h,$soname ${wl}--retain-symbols-file,$output_objdir/$soname.expsym ${wl}--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib'
;;
@@ -242,7 +254,7 @@ Local pkgsrc changes:
irix5* | irix6*)
case $cc_basename in
CC*)
-@@ -3503,14 +3533,29 @@
+@@ -3503,14 +3532,29 @@ case $host_os in
;;
netbsd*)
if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
@@ -274,7 +286,7 @@ Local pkgsrc changes:
;;
openbsd2*)
# C++ shared libraries are fairly broken
-@@ -3823,6 +3868,11 @@
+@@ -3823,6 +3867,11 @@ case $host_os in
# FIXME: insert proper C++ library support
_LT_AC_TAGVAR(ld_shlibs, $1)=no
;;
@@ -286,7 +298,7 @@ Local pkgsrc changes:
*)
# FIXME: insert proper C++ library support
_LT_AC_TAGVAR(ld_shlibs, $1)=no
-@@ -3985,6 +4035,21 @@
+@@ -3985,6 +4034,21 @@ if AC_TRY_EVAL(ac_compile); then
esac
done
@@ -308,7 +320,7 @@ Local pkgsrc changes:
# Clean up.
rm -f a.out a.exe
else
-@@ -5033,9 +5098,15 @@
+@@ -5033,9 +5097,15 @@ AC_MSG_CHECKING([for $compiler option to
[_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-DDLL_EXPORT'])
;;
darwin* | rhapsody*)
@@ -325,7 +337,7 @@ Local pkgsrc changes:
;;
*djgpp*)
# DJGPP does not support shared libraries at all
-@@ -5061,6 +5132,10 @@
+@@ -5061,6 +5131,10 @@ AC_MSG_CHECKING([for $compiler option to
;;
esac
;;
@@ -336,7 +348,7 @@ Local pkgsrc changes:
*)
_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC'
;;
-@@ -5107,6 +5182,9 @@
+@@ -5107,6 +5181,9 @@ AC_MSG_CHECKING([for $compiler option to
;;
esac
;;
@@ -346,7 +358,7 @@ Local pkgsrc changes:
freebsd* | dragonfly*)
# FreeBSD uses GNU C++
;;
-@@ -5139,6 +5217,8 @@
+@@ -5139,6 +5216,8 @@ AC_MSG_CHECKING([for $compiler option to
# This is c89, which is MS Visual C++ (no shared libs)
# Anyone wants to do a port?
;;
@@ -355,7 +367,7 @@ Local pkgsrc changes:
irix5* | irix6* | nonstopux*)
case $cc_basename in
CC*)
-@@ -5278,6 +5358,8 @@
+@@ -5278,6 +5357,8 @@ AC_MSG_CHECKING([for $compiler option to
;;
vxworks*)
;;
@@ -364,7 +376,7 @@ Local pkgsrc changes:
*)
_LT_AC_TAGVAR(lt_prog_compiler_can_build_shared, $1)=no
;;
-@@ -5319,9 +5401,11 @@
+@@ -5319,9 +5400,11 @@ AC_MSG_CHECKING([for $compiler option to
;;
darwin* | rhapsody*)
@@ -377,7 +389,7 @@ Local pkgsrc changes:
;;
interix[[3-9]]*)
-@@ -5329,6 +5413,13 @@
+@@ -5329,6 +5412,13 @@ AC_MSG_CHECKING([for $compiler option to
# Instead, we relocate shared libraries at runtime.
;;
@@ -391,7 +403,7 @@ Local pkgsrc changes:
msdosdjgpp*)
# Just because we use GCC doesn't mean we suddenly get shared libraries
# on systems that don't support them.
-@@ -5355,6 +5446,11 @@
+@@ -5355,6 +5445,11 @@ AC_MSG_CHECKING([for $compiler option to
esac
;;
@@ -403,7 +415,7 @@ Local pkgsrc changes:
*)
_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC'
;;
-@@ -5510,6 +5606,10 @@
+@@ -5510,6 +5605,10 @@ AC_MSG_CHECKING([for $compiler option to
_LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
;;
@@ -414,7 +426,7 @@ Local pkgsrc changes:
*)
_LT_AC_TAGVAR(lt_prog_compiler_can_build_shared, $1)=no
;;
-@@ -5534,6 +5634,9 @@
+@@ -5534,6 +5633,9 @@ if test -n "$_LT_AC_TAGVAR(lt_prog_compi
fi
case $host_os in
# For platforms which do not support PIC, -DPIC is meaningless:
@@ -424,7 +436,7 @@ Local pkgsrc changes:
*djgpp*)
_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)=
;;
-@@ -5791,6 +5894,17 @@
+@@ -5791,6 +5893,17 @@ EOF
fi
;;
@@ -442,7 +454,7 @@ Local pkgsrc changes:
netbsd*)
if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
_LT_AC_TAGVAR(archive_cmds, $1)='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib'
-@@ -5856,6 +5970,11 @@
+@@ -5856,6 +5969,11 @@ _LT_EOF
_LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
;;
@@ -454,7 +466,7 @@ Local pkgsrc changes:
*)
if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
_LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
-@@ -6210,6 +6329,21 @@
+@@ -6210,6 +6328,21 @@ _LT_EOF
fi
;;
@@ -476,7 +488,7 @@ Local pkgsrc changes:
irix5* | irix6* | nonstopux*)
if test "$GCC" = yes; then
_LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
-@@ -6435,6 +6569,13 @@
+@@ -6435,6 +6568,13 @@ _LT_EOF
_LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
;;
diff --git a/devel/libtool/patches/patch-ab b/devel/libtool/patches/patch-ab
index 58a3de327c6..914c282a290 100644
--- a/devel/libtool/patches/patch-ab
+++ b/devel/libtool/patches/patch-ab
@@ -1,6 +1,6 @@
-$NetBSD: patch-ab,v 1.61 2008/11/19 01:26:52 chuck Exp $
+$NetBSD: patch-ab,v 1.62 2009/03/23 23:03:59 joerg Exp $
---- configure.orig 2008-11-18 16:39:10.000000000 -0500
+--- configure.orig 2008-02-01 17:38:42.000000000 +0100
+++ configure
@@ -630,11 +630,11 @@ else
@@ -193,16 +193,18 @@ $NetBSD: patch-ab,v 1.61 2008/11/19 01:26:52 chuck Exp $
library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
soname_spec='${libname}${release}${shared_ext}$major'
finish_cmds='PATH="\$PATH:/sbin" ldconfig $libdir'
-@@ -9748,7 +9801,7 @@ freebsd1*)
+@@ -9748,9 +9801,7 @@ freebsd1*)
dynamic_linker=no
;;
-freebsd* | dragonfly*)
+- # DragonFly does not have aout. When/if they implement a new
+- # versioning mechanism, adjust this.
+freebsd*)
- # DragonFly does not have aout. When/if they implement a new
- # versioning mechanism, adjust this.
if test -x /usr/bin/objformat; then
-@@ -9762,7 +9815,7 @@ freebsd* | dragonfly*)
+ objformat=`/usr/bin/objformat`
+ else
+@@ -9762,7 +9813,7 @@ freebsd* | dragonfly*)
version_type=freebsd-$objformat
case $version_type in
freebsd-elf*)
@@ -211,15 +213,24 @@ $NetBSD: patch-ab,v 1.61 2008/11/19 01:26:52 chuck Exp $
need_version=no
need_lib_prefix=no
;;
-@@ -9792,6 +9845,16 @@ freebsd* | dragonfly*)
+@@ -9785,13 +9836,24 @@ freebsd* | dragonfly*)
+ shlibpath_overrides_runpath=no
+ hardcode_into_libs=yes
+ ;;
+- *) # from 4.6 on, and DragonFly
++ *) # from 4.6 on
+ shlibpath_overrides_runpath=yes
+ hardcode_into_libs=yes
+ ;;
esac
;;
+dragonfly*)
-+ version_type=linux # XXX tv this should be =linux; current selection has problems
++ version_type=linux
+ need_version=no
+ need_lib_prefix=no
+ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}'
++ soname_spec='${libname}${release}${shared_ext}$major'
+ shlibpath_var=LD_LIBRARY_PATH
+ shlibpath_overrides_runpath=no
+ hardcode_into_libs=yes
@@ -228,7 +239,7 @@ $NetBSD: patch-ab,v 1.61 2008/11/19 01:26:52 chuck Exp $
gnu*)
version_type=linux
need_lib_prefix=no
-@@ -9860,15 +9923,22 @@ interix[3-9]*)
+@@ -9860,15 +9922,22 @@ interix[3-9]*)
hardcode_into_libs=yes
;;
@@ -257,7 +268,7 @@ $NetBSD: patch-ab,v 1.61 2008/11/19 01:26:52 chuck Exp $
esac
need_lib_prefix=no
need_version=no
-@@ -9933,11 +10003,11 @@ linux* | k*bsd*-gnu)
+@@ -9933,11 +10002,11 @@ linux* | k*bsd*-gnu)
;;
netbsd*)
@@ -271,7 +282,7 @@ $NetBSD: patch-ab,v 1.61 2008/11/19 01:26:52 chuck Exp $
finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir'
dynamic_linker='NetBSD (a.out) ld.so'
else
-@@ -9962,13 +10032,14 @@ nto-qnx*)
+@@ -9962,13 +10031,14 @@ nto-qnx*)
need_lib_prefix=no
need_version=no
library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
@@ -287,7 +298,7 @@ $NetBSD: patch-ab,v 1.61 2008/11/19 01:26:52 chuck Exp $
sys_lib_dlsearch_path_spec="/usr/lib"
need_lib_prefix=no
# Some older versions of OpenBSD (3.3 at least) *do* need versioned libs.
-@@ -9976,7 +10047,7 @@ openbsd*)
+@@ -9976,7 +10046,7 @@ openbsd*)
openbsd3.3 | openbsd3.3.*) need_version=yes ;;
*) need_version=no ;;
esac
@@ -296,7 +307,7 @@ $NetBSD: patch-ab,v 1.61 2008/11/19 01:26:52 chuck Exp $
finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir'
shlibpath_var=LD_LIBRARY_PATH
if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
-@@ -11566,9 +11637,7 @@ echo "$as_me: error: tag name \"$tagname
+@@ -11566,9 +11636,7 @@ echo "$as_me: error: tag name \"$tagname
case $tagname in
CXX)
@@ -307,7 +318,7 @@ $NetBSD: patch-ab,v 1.61 2008/11/19 01:26:52 chuck Exp $
ac_ext=cpp
ac_cpp='$CXXCPP $CPPFLAGS'
ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-@@ -11674,7 +11743,10 @@ for cc_temp in $compiler""; do
+@@ -11674,7 +11742,10 @@ for cc_temp in $compiler""; do
*) break;;
esac
done
@@ -319,7 +330,7 @@ $NetBSD: patch-ab,v 1.61 2008/11/19 01:26:52 chuck Exp $
# We don't want -fno-exception wen compiling C++ code, so set the
-@@ -12309,6 +12381,16 @@ if test -z "$aix_libpath"; then aix_libp
+@@ -12309,6 +12380,16 @@ if test -z "$aix_libpath"; then aix_libp
archive_cmds_CXX='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-h,$soname ${wl}--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib'
archive_expsym_cmds_CXX='sed "s,^,_," $export_symbols >$output_objdir/$soname.expsym~$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-h,$soname ${wl}--retain-symbols-file,$output_objdir/$soname.expsym ${wl}--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib'
;;
@@ -336,7 +347,7 @@ $NetBSD: patch-ab,v 1.61 2008/11/19 01:26:52 chuck Exp $
irix5* | irix6*)
case $cc_basename in
CC*)
-@@ -12462,14 +12544,29 @@ if test -z "$aix_libpath"; then aix_libp
+@@ -12462,14 +12543,29 @@ if test -z "$aix_libpath"; then aix_libp
;;
netbsd*)
if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
@@ -368,7 +379,7 @@ $NetBSD: patch-ab,v 1.61 2008/11/19 01:26:52 chuck Exp $
;;
openbsd2*)
# C++ shared libraries are fairly broken
-@@ -12782,6 +12879,11 @@ if test -z "$aix_libpath"; then aix_libp
+@@ -12782,6 +12878,11 @@ if test -z "$aix_libpath"; then aix_libp
# FIXME: insert proper C++ library support
ld_shlibs_CXX=no
;;
@@ -380,7 +391,7 @@ $NetBSD: patch-ab,v 1.61 2008/11/19 01:26:52 chuck Exp $
*)
# FIXME: insert proper C++ library support
ld_shlibs_CXX=no
-@@ -12891,6 +12993,21 @@ if { (eval echo "$as_me:$LINENO: \"$ac_c
+@@ -12891,6 +12992,21 @@ if { (eval echo "$as_me:$LINENO: \"$ac_c
esac
done
@@ -402,7 +413,7 @@ $NetBSD: patch-ab,v 1.61 2008/11/19 01:26:52 chuck Exp $
# Clean up.
rm -f a.out a.exe
else
-@@ -13000,9 +13117,11 @@ echo $ECHO_N "checking for $compiler opt
+@@ -13000,9 +13116,11 @@ echo $ECHO_N "checking for $compiler opt
lt_prog_compiler_pic_CXX='-DDLL_EXPORT'
;;
darwin* | rhapsody*)
@@ -415,7 +426,7 @@ $NetBSD: patch-ab,v 1.61 2008/11/19 01:26:52 chuck Exp $
;;
*djgpp*)
# DJGPP does not support shared libraries at all
-@@ -13028,6 +13147,10 @@ echo $ECHO_N "checking for $compiler opt
+@@ -13028,6 +13146,10 @@ echo $ECHO_N "checking for $compiler opt
;;
esac
;;
@@ -426,7 +437,7 @@ $NetBSD: patch-ab,v 1.61 2008/11/19 01:26:52 chuck Exp $
*)
lt_prog_compiler_pic_CXX='-fPIC'
;;
-@@ -13106,6 +13229,8 @@ echo $ECHO_N "checking for $compiler opt
+@@ -13106,6 +13228,8 @@ echo $ECHO_N "checking for $compiler opt
# This is c89, which is MS Visual C++ (no shared libs)
# Anyone wants to do a port?
;;
@@ -435,7 +446,7 @@ $NetBSD: patch-ab,v 1.61 2008/11/19 01:26:52 chuck Exp $
irix5* | irix6* | nonstopux*)
case $cc_basename in
CC*)
-@@ -13245,6 +13370,8 @@ echo $ECHO_N "checking for $compiler opt
+@@ -13245,6 +13369,8 @@ echo $ECHO_N "checking for $compiler opt
;;
vxworks*)
;;
@@ -444,7 +455,7 @@ $NetBSD: patch-ab,v 1.61 2008/11/19 01:26:52 chuck Exp $
*)
lt_prog_compiler_can_build_shared_CXX=no
;;
-@@ -13618,6 +13745,7 @@ beos*)
+@@ -13618,6 +13744,7 @@ beos*)
bsdi[45]*)
version_type=linux
need_version=no
@@ -452,16 +463,18 @@ $NetBSD: patch-ab,v 1.61 2008/11/19 01:26:52 chuck Exp $
library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
soname_spec='${libname}${release}${shared_ext}$major'
finish_cmds='PATH="\$PATH:/sbin" ldconfig $libdir'
-@@ -13715,7 +13843,7 @@ freebsd1*)
+@@ -13715,9 +13842,7 @@ freebsd1*)
dynamic_linker=no
;;
-freebsd* | dragonfly*)
+- # DragonFly does not have aout. When/if they implement a new
+- # versioning mechanism, adjust this.
+freebsd*)
- # DragonFly does not have aout. When/if they implement a new
- # versioning mechanism, adjust this.
if test -x /usr/bin/objformat; then
-@@ -13729,7 +13857,7 @@ freebsd* | dragonfly*)
+ objformat=`/usr/bin/objformat`
+ else
+@@ -13729,7 +13854,7 @@ freebsd* | dragonfly*)
version_type=freebsd-$objformat
case $version_type in
freebsd-elf*)
@@ -470,15 +483,24 @@ $NetBSD: patch-ab,v 1.61 2008/11/19 01:26:52 chuck Exp $
need_version=no
need_lib_prefix=no
;;
-@@ -13759,6 +13887,16 @@ freebsd* | dragonfly*)
+@@ -13752,13 +13877,24 @@ freebsd* | dragonfly*)
+ shlibpath_overrides_runpath=no
+ hardcode_into_libs=yes
+ ;;
+- *) # from 4.6 on, and DragonFly
++ *) # from 4.6 on
+ shlibpath_overrides_runpath=yes
+ hardcode_into_libs=yes
+ ;;
esac
;;
+dragonfly*)
-+ version_type=linux # XXX tv this should be =linux; current selection has problems
++ version_type=linux
+ need_version=no
+ need_lib_prefix=no
+ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}'
++ soname_spec='${libname}${release}${shared_ext}$major'
+ shlibpath_var=LD_LIBRARY_PATH
+ shlibpath_overrides_runpath=no
+ hardcode_into_libs=yes
@@ -487,7 +509,7 @@ $NetBSD: patch-ab,v 1.61 2008/11/19 01:26:52 chuck Exp $
gnu*)
version_type=linux
need_lib_prefix=no
-@@ -13827,15 +13965,22 @@ interix[3-9]*)
+@@ -13827,15 +13963,22 @@ interix[3-9]*)
hardcode_into_libs=yes
;;
@@ -516,7 +538,7 @@ $NetBSD: patch-ab,v 1.61 2008/11/19 01:26:52 chuck Exp $
esac
need_lib_prefix=no
need_version=no
-@@ -13900,11 +14045,11 @@ linux* | k*bsd*-gnu)
+@@ -13900,11 +14043,11 @@ linux* | k*bsd*-gnu)
;;
netbsd*)
@@ -530,7 +552,7 @@ $NetBSD: patch-ab,v 1.61 2008/11/19 01:26:52 chuck Exp $
finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir'
dynamic_linker='NetBSD (a.out) ld.so'
else
-@@ -13929,13 +14074,14 @@ nto-qnx*)
+@@ -13929,13 +14072,14 @@ nto-qnx*)
need_lib_prefix=no
need_version=no
library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
@@ -546,7 +568,7 @@ $NetBSD: patch-ab,v 1.61 2008/11/19 01:26:52 chuck Exp $
sys_lib_dlsearch_path_spec="/usr/lib"
need_lib_prefix=no
# Some older versions of OpenBSD (3.3 at least) *do* need versioned libs.
-@@ -13943,7 +14089,7 @@ openbsd*)
+@@ -13943,7 +14087,7 @@ openbsd*)
openbsd3.3 | openbsd3.3.*) need_version=yes ;;
*) need_version=no ;;
esac
@@ -555,7 +577,7 @@ $NetBSD: patch-ab,v 1.61 2008/11/19 01:26:52 chuck Exp $
finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir'
shlibpath_var=LD_LIBRARY_PATH
if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
-@@ -14661,7 +14807,10 @@ for cc_temp in $compiler""; do
+@@ -14661,7 +14805,10 @@ for cc_temp in $compiler""; do
*) break;;
esac
done
@@ -567,7 +589,7 @@ $NetBSD: patch-ab,v 1.61 2008/11/19 01:26:52 chuck Exp $
{ echo "$as_me:$LINENO: checking if libtool supports shared libraries" >&5
-@@ -14742,9 +14891,11 @@ echo $ECHO_N "checking for $compiler opt
+@@ -14742,9 +14889,11 @@ echo $ECHO_N "checking for $compiler opt
;;
darwin* | rhapsody*)
@@ -580,7 +602,7 @@ $NetBSD: patch-ab,v 1.61 2008/11/19 01:26:52 chuck Exp $
;;
interix[3-9]*)
-@@ -14778,6 +14929,11 @@ echo $ECHO_N "checking for $compiler opt
+@@ -14778,6 +14927,11 @@ echo $ECHO_N "checking for $compiler opt
esac
;;
@@ -592,7 +614,7 @@ $NetBSD: patch-ab,v 1.61 2008/11/19 01:26:52 chuck Exp $
*)
lt_prog_compiler_pic_F77='-fPIC'
;;
-@@ -14932,6 +15088,10 @@ echo $ECHO_N "checking for $compiler opt
+@@ -14932,6 +15086,10 @@ echo $ECHO_N "checking for $compiler opt
lt_prog_compiler_static_F77='-Bstatic'
;;
@@ -603,7 +625,7 @@ $NetBSD: patch-ab,v 1.61 2008/11/19 01:26:52 chuck Exp $
*)
lt_prog_compiler_can_build_shared_F77=no
;;
-@@ -15169,7 +15329,10 @@ echo $ECHO_N "checking whether the $comp
+@@ -15169,7 +15327,10 @@ echo $ECHO_N "checking whether the $comp
*) break;;
esac
done
@@ -615,7 +637,7 @@ $NetBSD: patch-ab,v 1.61 2008/11/19 01:26:52 chuck Exp $
case $host_os in
cygwin* | mingw* | pw32*)
-@@ -15338,6 +15501,17 @@ EOF
+@@ -15338,6 +15499,17 @@ EOF
fi
;;
@@ -633,7 +655,7 @@ $NetBSD: patch-ab,v 1.61 2008/11/19 01:26:52 chuck Exp $
netbsd*)
if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
archive_cmds_F77='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib'
-@@ -15403,6 +15577,11 @@ _LT_EOF
+@@ -15403,6 +15575,11 @@ _LT_EOF
hardcode_shlibpath_var_F77=no
;;
@@ -645,7 +667,7 @@ $NetBSD: patch-ab,v 1.61 2008/11/19 01:26:52 chuck Exp $
*)
if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
archive_cmds_F77='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
-@@ -15849,6 +16028,21 @@ if test -z "$aix_libpath"; then aix_libp
+@@ -15849,6 +16026,21 @@ if test -z "$aix_libpath"; then aix_libp
fi
;;
@@ -667,7 +689,7 @@ $NetBSD: patch-ab,v 1.61 2008/11/19 01:26:52 chuck Exp $
irix5* | irix6* | nonstopux*)
if test "$GCC" = yes; then
archive_cmds_F77='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
-@@ -16074,6 +16268,13 @@ if test -z "$aix_libpath"; then aix_libp
+@@ -16074,6 +16266,13 @@ if test -z "$aix_libpath"; then aix_libp
hardcode_shlibpath_var_F77=no
;;
@@ -681,7 +703,7 @@ $NetBSD: patch-ab,v 1.61 2008/11/19 01:26:52 chuck Exp $
*)
ld_shlibs_F77=no
;;
-@@ -16239,6 +16440,7 @@ beos*)
+@@ -16239,6 +16438,7 @@ beos*)
bsdi[45]*)
version_type=linux
need_version=no
@@ -689,16 +711,18 @@ $NetBSD: patch-ab,v 1.61 2008/11/19 01:26:52 chuck Exp $
library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
soname_spec='${libname}${release}${shared_ext}$major'
finish_cmds='PATH="\$PATH:/sbin" ldconfig $libdir'
-@@ -16336,7 +16538,7 @@ freebsd1*)
+@@ -16336,9 +16536,7 @@ freebsd1*)
dynamic_linker=no
;;
-freebsd* | dragonfly*)
+- # DragonFly does not have aout. When/if they implement a new
+- # versioning mechanism, adjust this.
+freebsd*)
- # DragonFly does not have aout. When/if they implement a new
- # versioning mechanism, adjust this.
if test -x /usr/bin/objformat; then
-@@ -16350,7 +16552,7 @@ freebsd* | dragonfly*)
+ objformat=`/usr/bin/objformat`
+ else
+@@ -16350,7 +16548,7 @@ freebsd* | dragonfly*)
version_type=freebsd-$objformat
case $version_type in
freebsd-elf*)
@@ -707,15 +731,24 @@ $NetBSD: patch-ab,v 1.61 2008/11/19 01:26:52 chuck Exp $
need_version=no
need_lib_prefix=no
;;
-@@ -16380,6 +16582,16 @@ freebsd* | dragonfly*)
+@@ -16373,13 +16571,24 @@ freebsd* | dragonfly*)
+ shlibpath_overrides_runpath=no
+ hardcode_into_libs=yes
+ ;;
+- *) # from 4.6 on, and DragonFly
++ *) # from 4.6 on
+ shlibpath_overrides_runpath=yes
+ hardcode_into_libs=yes
+ ;;
esac
;;
+dragonfly*)
-+ version_type=linux # XXX tv this should be =linux; current selection has problems
++ version_type=linux
+ need_version=no
+ need_lib_prefix=no
+ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}'
++ soname_spec='${libname}${release}${shared_ext}$major'
+ shlibpath_var=LD_LIBRARY_PATH
+ shlibpath_overrides_runpath=no
+ hardcode_into_libs=yes
@@ -724,7 +757,7 @@ $NetBSD: patch-ab,v 1.61 2008/11/19 01:26:52 chuck Exp $
gnu*)
version_type=linux
need_lib_prefix=no
-@@ -16448,15 +16660,22 @@ interix[3-9]*)
+@@ -16448,15 +16657,22 @@ interix[3-9]*)
hardcode_into_libs=yes
;;
@@ -753,7 +786,7 @@ $NetBSD: patch-ab,v 1.61 2008/11/19 01:26:52 chuck Exp $
esac
need_lib_prefix=no
need_version=no
-@@ -16521,11 +16740,11 @@ linux* | k*bsd*-gnu)
+@@ -16521,11 +16737,11 @@ linux* | k*bsd*-gnu)
;;
netbsd*)
@@ -767,7 +800,7 @@ $NetBSD: patch-ab,v 1.61 2008/11/19 01:26:52 chuck Exp $
finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir'
dynamic_linker='NetBSD (a.out) ld.so'
else
-@@ -16550,13 +16769,14 @@ nto-qnx*)
+@@ -16550,13 +16766,14 @@ nto-qnx*)
need_lib_prefix=no
need_version=no
library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
@@ -783,7 +816,7 @@ $NetBSD: patch-ab,v 1.61 2008/11/19 01:26:52 chuck Exp $
sys_lib_dlsearch_path_spec="/usr/lib"
need_lib_prefix=no
# Some older versions of OpenBSD (3.3 at least) *do* need versioned libs.
-@@ -16564,7 +16784,7 @@ openbsd*)
+@@ -16564,7 +16781,7 @@ openbsd*)
openbsd3.3 | openbsd3.3.*) need_version=yes ;;
*) need_version=no ;;
esac
@@ -792,7 +825,7 @@ $NetBSD: patch-ab,v 1.61 2008/11/19 01:26:52 chuck Exp $
finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir'
shlibpath_var=LD_LIBRARY_PATH
if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
-@@ -17242,7 +17462,10 @@ for cc_temp in $compiler""; do
+@@ -17242,7 +17459,10 @@ for cc_temp in $compiler""; do
*) break;;
esac
done
@@ -804,7 +837,7 @@ $NetBSD: patch-ab,v 1.61 2008/11/19 01:26:52 chuck Exp $
# GCJ did not exist at the time GCC didn't implicitly link libc in.
-@@ -17347,9 +17570,11 @@ echo $ECHO_N "checking for $compiler opt
+@@ -17347,9 +17567,11 @@ echo $ECHO_N "checking for $compiler opt
;;
darwin* | rhapsody*)
@@ -817,7 +850,7 @@ $NetBSD: patch-ab,v 1.61 2008/11/19 01:26:52 chuck Exp $
;;
interix[3-9]*)
-@@ -17383,6 +17608,11 @@ echo $ECHO_N "checking for $compiler opt
+@@ -17383,6 +17605,11 @@ echo $ECHO_N "checking for $compiler opt
esac
;;
@@ -829,7 +862,7 @@ $NetBSD: patch-ab,v 1.61 2008/11/19 01:26:52 chuck Exp $
*)
lt_prog_compiler_pic_GCJ='-fPIC'
;;
-@@ -17537,6 +17767,10 @@ echo $ECHO_N "checking for $compiler opt
+@@ -17537,6 +17764,10 @@ echo $ECHO_N "checking for $compiler opt
lt_prog_compiler_static_GCJ='-Bstatic'
;;
@@ -840,7 +873,7 @@ $NetBSD: patch-ab,v 1.61 2008/11/19 01:26:52 chuck Exp $
*)
lt_prog_compiler_can_build_shared_GCJ=no
;;
-@@ -17774,7 +18008,10 @@ echo $ECHO_N "checking whether the $comp
+@@ -17774,7 +18005,10 @@ echo $ECHO_N "checking whether the $comp
*) break;;
esac
done
@@ -852,7 +885,7 @@ $NetBSD: patch-ab,v 1.61 2008/11/19 01:26:52 chuck Exp $
case $host_os in
cygwin* | mingw* | pw32*)
-@@ -17943,6 +18180,17 @@ EOF
+@@ -17943,6 +18177,17 @@ EOF
fi
;;
@@ -870,7 +903,7 @@ $NetBSD: patch-ab,v 1.61 2008/11/19 01:26:52 chuck Exp $
netbsd*)
if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
archive_cmds_GCJ='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib'
-@@ -18008,6 +18256,11 @@ _LT_EOF
+@@ -18008,6 +18253,11 @@ _LT_EOF
hardcode_shlibpath_var_GCJ=no
;;
@@ -882,7 +915,7 @@ $NetBSD: patch-ab,v 1.61 2008/11/19 01:26:52 chuck Exp $
*)
if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
archive_cmds_GCJ='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
-@@ -18474,6 +18727,21 @@ if test -z "$aix_libpath"; then aix_libp
+@@ -18474,6 +18724,21 @@ if test -z "$aix_libpath"; then aix_libp
fi
;;
@@ -904,7 +937,7 @@ $NetBSD: patch-ab,v 1.61 2008/11/19 01:26:52 chuck Exp $
irix5* | irix6* | nonstopux*)
if test "$GCC" = yes; then
archive_cmds_GCJ='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
-@@ -18699,6 +18967,13 @@ if test -z "$aix_libpath"; then aix_libp
+@@ -18699,6 +18964,13 @@ if test -z "$aix_libpath"; then aix_libp
hardcode_shlibpath_var_GCJ=no
;;
@@ -918,7 +951,7 @@ $NetBSD: patch-ab,v 1.61 2008/11/19 01:26:52 chuck Exp $
*)
ld_shlibs_GCJ=no
;;
-@@ -18864,6 +19139,7 @@ beos*)
+@@ -18864,6 +19136,7 @@ beos*)
bsdi[45]*)
version_type=linux
need_version=no
@@ -926,16 +959,18 @@ $NetBSD: patch-ab,v 1.61 2008/11/19 01:26:52 chuck Exp $
library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
soname_spec='${libname}${release}${shared_ext}$major'
finish_cmds='PATH="\$PATH:/sbin" ldconfig $libdir'
-@@ -18961,7 +19237,7 @@ freebsd1*)
+@@ -18961,9 +19234,7 @@ freebsd1*)
dynamic_linker=no
;;
-freebsd* | dragonfly*)
+- # DragonFly does not have aout. When/if they implement a new
+- # versioning mechanism, adjust this.
+freebsd*)
- # DragonFly does not have aout. When/if they implement a new
- # versioning mechanism, adjust this.
if test -x /usr/bin/objformat; then
-@@ -18975,7 +19251,7 @@ freebsd* | dragonfly*)
+ objformat=`/usr/bin/objformat`
+ else
+@@ -18975,7 +19246,7 @@ freebsd* | dragonfly*)
version_type=freebsd-$objformat
case $version_type in
freebsd-elf*)
@@ -944,15 +979,24 @@ $NetBSD: patch-ab,v 1.61 2008/11/19 01:26:52 chuck Exp $
need_version=no
need_lib_prefix=no
;;
-@@ -19005,6 +19281,16 @@ freebsd* | dragonfly*)
+@@ -18998,13 +19269,24 @@ freebsd* | dragonfly*)
+ shlibpath_overrides_runpath=no
+ hardcode_into_libs=yes
+ ;;
+- *) # from 4.6 on, and DragonFly
++ *) # from 4.6 on
+ shlibpath_overrides_runpath=yes
+ hardcode_into_libs=yes
+ ;;
esac
;;
+dragonfly*)
-+ version_type=linux # XXX tv this should be =linux; current selection has problems
++ version_type=linux
+ need_version=no
+ need_lib_prefix=no
+ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}'
++ soname_spec='${libname}${release}${shared_ext}$major'
+ shlibpath_var=LD_LIBRARY_PATH
+ shlibpath_overrides_runpath=no
+ hardcode_into_libs=yes
@@ -961,7 +1005,7 @@ $NetBSD: patch-ab,v 1.61 2008/11/19 01:26:52 chuck Exp $
gnu*)
version_type=linux
need_lib_prefix=no
-@@ -19073,15 +19359,22 @@ interix[3-9]*)
+@@ -19073,15 +19355,22 @@ interix[3-9]*)
hardcode_into_libs=yes
;;
@@ -990,7 +1034,7 @@ $NetBSD: patch-ab,v 1.61 2008/11/19 01:26:52 chuck Exp $
esac
need_lib_prefix=no
need_version=no
-@@ -19146,11 +19439,11 @@ linux* | k*bsd*-gnu)
+@@ -19146,11 +19435,11 @@ linux* | k*bsd*-gnu)
;;
netbsd*)
@@ -1004,7 +1048,7 @@ $NetBSD: patch-ab,v 1.61 2008/11/19 01:26:52 chuck Exp $
finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir'
dynamic_linker='NetBSD (a.out) ld.so'
else
-@@ -19175,13 +19468,14 @@ nto-qnx*)
+@@ -19175,13 +19464,14 @@ nto-qnx*)
need_lib_prefix=no
need_version=no
library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
@@ -1020,7 +1064,7 @@ $NetBSD: patch-ab,v 1.61 2008/11/19 01:26:52 chuck Exp $
sys_lib_dlsearch_path_spec="/usr/lib"
need_lib_prefix=no
# Some older versions of OpenBSD (3.3 at least) *do* need versioned libs.
-@@ -19189,7 +19483,7 @@ openbsd*)
+@@ -19189,7 +19479,7 @@ openbsd*)
openbsd3.3 | openbsd3.3.*) need_version=yes ;;
*) need_version=no ;;
esac
@@ -1029,7 +1073,7 @@ $NetBSD: patch-ab,v 1.61 2008/11/19 01:26:52 chuck Exp $
finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir'
shlibpath_var=LD_LIBRARY_PATH
if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
-@@ -19866,7 +20160,10 @@ for cc_temp in $compiler""; do
+@@ -19866,7 +20156,10 @@ for cc_temp in $compiler""; do
*) break;;
esac
done
@@ -1041,7 +1085,7 @@ $NetBSD: patch-ab,v 1.61 2008/11/19 01:26:52 chuck Exp $
lt_cv_prog_compiler_c_o_RC=yes
-@@ -21547,7 +21844,7 @@ echo "$as_me: executing $ac_file command
+@@ -21547,7 +21840,7 @@ echo "$as_me: executing $ac_file command
# each Makefile.in and add a new line on top of each file to say so.
# Grep'ing the whole file is not good either: AIX grep has a line
# limit of 2048, but all sed's we know have understand at least 4000.
diff --git a/devel/libtool/patches/patch-ad b/devel/libtool/patches/patch-ad
index c9c282b24df..541512690b4 100644
--- a/devel/libtool/patches/patch-ad
+++ b/devel/libtool/patches/patch-ad
@@ -1,6 +1,6 @@
-$NetBSD: patch-ad,v 1.33 2008/11/19 01:26:52 chuck Exp $
+$NetBSD: patch-ad,v 1.34 2009/03/23 23:03:59 joerg Exp $
---- libltdl/configure.orig 2008-11-18 16:39:34.000000000 -0500
+--- libltdl/configure.orig 2008-02-01 17:38:49.000000000 +0100
+++ libltdl/configure
@@ -630,11 +630,11 @@ else
@@ -193,16 +193,18 @@ $NetBSD: patch-ad,v 1.33 2008/11/19 01:26:52 chuck Exp $
library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
soname_spec='${libname}${release}${shared_ext}$major'
finish_cmds='PATH="\$PATH:/sbin" ldconfig $libdir'
-@@ -9615,7 +9668,7 @@ freebsd1*)
+@@ -9615,9 +9668,7 @@ freebsd1*)
dynamic_linker=no
;;
-freebsd* | dragonfly*)
+- # DragonFly does not have aout. When/if they implement a new
+- # versioning mechanism, adjust this.
+freebsd*)
- # DragonFly does not have aout. When/if they implement a new
- # versioning mechanism, adjust this.
if test -x /usr/bin/objformat; then
-@@ -9629,7 +9682,7 @@ freebsd* | dragonfly*)
+ objformat=`/usr/bin/objformat`
+ else
+@@ -9629,7 +9680,7 @@ freebsd* | dragonfly*)
version_type=freebsd-$objformat
case $version_type in
freebsd-elf*)
@@ -211,15 +213,24 @@ $NetBSD: patch-ad,v 1.33 2008/11/19 01:26:52 chuck Exp $
need_version=no
need_lib_prefix=no
;;
-@@ -9659,6 +9712,16 @@ freebsd* | dragonfly*)
+@@ -9652,13 +9703,24 @@ freebsd* | dragonfly*)
+ shlibpath_overrides_runpath=no
+ hardcode_into_libs=yes
+ ;;
+- *) # from 4.6 on, and DragonFly
++ *) # from 4.6 on
+ shlibpath_overrides_runpath=yes
+ hardcode_into_libs=yes
+ ;;
esac
;;
+dragonfly*)
-+ version_type=linux # XXX tv this should be =linux; current selection has problems
++ version_type=linux
+ need_version=no
+ need_lib_prefix=no
+ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}'
++ soname_spec='${libname}${release}${shared_ext}$major'
+ shlibpath_var=LD_LIBRARY_PATH
+ shlibpath_overrides_runpath=no
+ hardcode_into_libs=yes
@@ -228,7 +239,7 @@ $NetBSD: patch-ad,v 1.33 2008/11/19 01:26:52 chuck Exp $
gnu*)
version_type=linux
need_lib_prefix=no
-@@ -9727,15 +9790,22 @@ interix[3-9]*)
+@@ -9727,15 +9789,22 @@ interix[3-9]*)
hardcode_into_libs=yes
;;
@@ -257,7 +268,7 @@ $NetBSD: patch-ad,v 1.33 2008/11/19 01:26:52 chuck Exp $
esac
need_lib_prefix=no
need_version=no
-@@ -9800,11 +9870,11 @@ linux* | k*bsd*-gnu)
+@@ -9800,11 +9869,11 @@ linux* | k*bsd*-gnu)
;;
netbsd*)
@@ -271,7 +282,7 @@ $NetBSD: patch-ad,v 1.33 2008/11/19 01:26:52 chuck Exp $
finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir'
dynamic_linker='NetBSD (a.out) ld.so'
else
-@@ -9829,13 +9899,14 @@ nto-qnx*)
+@@ -9829,13 +9898,14 @@ nto-qnx*)
need_lib_prefix=no
need_version=no
library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
@@ -287,7 +298,7 @@ $NetBSD: patch-ad,v 1.33 2008/11/19 01:26:52 chuck Exp $
sys_lib_dlsearch_path_spec="/usr/lib"
need_lib_prefix=no
# Some older versions of OpenBSD (3.3 at least) *do* need versioned libs.
-@@ -9843,7 +9914,7 @@ openbsd*)
+@@ -9843,7 +9913,7 @@ openbsd*)
openbsd3.3 | openbsd3.3.*) need_version=yes ;;
*) need_version=no ;;
esac
@@ -296,7 +307,7 @@ $NetBSD: patch-ad,v 1.33 2008/11/19 01:26:52 chuck Exp $
finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir'
shlibpath_var=LD_LIBRARY_PATH
if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
-@@ -11433,9 +11504,7 @@ echo "$as_me: error: tag name \"$tagname
+@@ -11433,9 +11503,7 @@ echo "$as_me: error: tag name \"$tagname
case $tagname in
CXX)
@@ -307,7 +318,7 @@ $NetBSD: patch-ad,v 1.33 2008/11/19 01:26:52 chuck Exp $
ac_ext=cpp
ac_cpp='$CXXCPP $CPPFLAGS'
ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-@@ -11541,7 +11610,10 @@ for cc_temp in $compiler""; do
+@@ -11541,7 +11609,10 @@ for cc_temp in $compiler""; do
*) break;;
esac
done
@@ -319,7 +330,7 @@ $NetBSD: patch-ad,v 1.33 2008/11/19 01:26:52 chuck Exp $
# We don't want -fno-exception wen compiling C++ code, so set the
-@@ -12176,6 +12248,16 @@ if test -z "$aix_libpath"; then aix_libp
+@@ -12176,6 +12247,16 @@ if test -z "$aix_libpath"; then aix_libp
archive_cmds_CXX='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-h,$soname ${wl}--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib'
archive_expsym_cmds_CXX='sed "s,^,_," $export_symbols >$output_objdir/$soname.expsym~$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-h,$soname ${wl}--retain-symbols-file,$output_objdir/$soname.expsym ${wl}--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib'
;;
@@ -336,7 +347,7 @@ $NetBSD: patch-ad,v 1.33 2008/11/19 01:26:52 chuck Exp $
irix5* | irix6*)
case $cc_basename in
CC*)
-@@ -12329,14 +12411,29 @@ if test -z "$aix_libpath"; then aix_libp
+@@ -12329,14 +12410,29 @@ if test -z "$aix_libpath"; then aix_libp
;;
netbsd*)
if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
@@ -368,7 +379,7 @@ $NetBSD: patch-ad,v 1.33 2008/11/19 01:26:52 chuck Exp $
;;
openbsd2*)
# C++ shared libraries are fairly broken
-@@ -12649,6 +12746,11 @@ if test -z "$aix_libpath"; then aix_libp
+@@ -12649,6 +12745,11 @@ if test -z "$aix_libpath"; then aix_libp
# FIXME: insert proper C++ library support
ld_shlibs_CXX=no
;;
@@ -380,7 +391,7 @@ $NetBSD: patch-ad,v 1.33 2008/11/19 01:26:52 chuck Exp $
*)
# FIXME: insert proper C++ library support
ld_shlibs_CXX=no
-@@ -12758,6 +12860,21 @@ if { (eval echo "$as_me:$LINENO: \"$ac_c
+@@ -12758,6 +12859,21 @@ if { (eval echo "$as_me:$LINENO: \"$ac_c
esac
done
@@ -402,7 +413,7 @@ $NetBSD: patch-ad,v 1.33 2008/11/19 01:26:52 chuck Exp $
# Clean up.
rm -f a.out a.exe
else
-@@ -12867,9 +12984,11 @@ echo $ECHO_N "checking for $compiler opt
+@@ -12867,9 +12983,11 @@ echo $ECHO_N "checking for $compiler opt
lt_prog_compiler_pic_CXX='-DDLL_EXPORT'
;;
darwin* | rhapsody*)
@@ -415,7 +426,7 @@ $NetBSD: patch-ad,v 1.33 2008/11/19 01:26:52 chuck Exp $
;;
*djgpp*)
# DJGPP does not support shared libraries at all
-@@ -12895,6 +13014,10 @@ echo $ECHO_N "checking for $compiler opt
+@@ -12895,6 +13013,10 @@ echo $ECHO_N "checking for $compiler opt
;;
esac
;;
@@ -426,7 +437,7 @@ $NetBSD: patch-ad,v 1.33 2008/11/19 01:26:52 chuck Exp $
*)
lt_prog_compiler_pic_CXX='-fPIC'
;;
-@@ -12973,6 +13096,8 @@ echo $ECHO_N "checking for $compiler opt
+@@ -12973,6 +13095,8 @@ echo $ECHO_N "checking for $compiler opt
# This is c89, which is MS Visual C++ (no shared libs)
# Anyone wants to do a port?
;;
@@ -435,7 +446,7 @@ $NetBSD: patch-ad,v 1.33 2008/11/19 01:26:52 chuck Exp $
irix5* | irix6* | nonstopux*)
case $cc_basename in
CC*)
-@@ -13112,6 +13237,8 @@ echo $ECHO_N "checking for $compiler opt
+@@ -13112,6 +13236,8 @@ echo $ECHO_N "checking for $compiler opt
;;
vxworks*)
;;
@@ -444,7 +455,7 @@ $NetBSD: patch-ad,v 1.33 2008/11/19 01:26:52 chuck Exp $
*)
lt_prog_compiler_can_build_shared_CXX=no
;;
-@@ -13485,6 +13612,7 @@ beos*)
+@@ -13485,6 +13611,7 @@ beos*)
bsdi[45]*)
version_type=linux
need_version=no
@@ -452,16 +463,18 @@ $NetBSD: patch-ad,v 1.33 2008/11/19 01:26:52 chuck Exp $
library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
soname_spec='${libname}${release}${shared_ext}$major'
finish_cmds='PATH="\$PATH:/sbin" ldconfig $libdir'
-@@ -13582,7 +13710,7 @@ freebsd1*)
+@@ -13582,9 +13709,7 @@ freebsd1*)
dynamic_linker=no
;;
-freebsd* | dragonfly*)
+- # DragonFly does not have aout. When/if they implement a new
+- # versioning mechanism, adjust this.
+freebsd*)
- # DragonFly does not have aout. When/if they implement a new
- # versioning mechanism, adjust this.
if test -x /usr/bin/objformat; then
-@@ -13596,7 +13724,7 @@ freebsd* | dragonfly*)
+ objformat=`/usr/bin/objformat`
+ else
+@@ -13596,7 +13721,7 @@ freebsd* | dragonfly*)
version_type=freebsd-$objformat
case $version_type in
freebsd-elf*)
@@ -470,15 +483,24 @@ $NetBSD: patch-ad,v 1.33 2008/11/19 01:26:52 chuck Exp $
need_version=no
need_lib_prefix=no
;;
-@@ -13626,6 +13754,16 @@ freebsd* | dragonfly*)
+@@ -13619,13 +13744,24 @@ freebsd* | dragonfly*)
+ shlibpath_overrides_runpath=no
+ hardcode_into_libs=yes
+ ;;
+- *) # from 4.6 on, and DragonFly
++ *) # from 4.6 on
+ shlibpath_overrides_runpath=yes
+ hardcode_into_libs=yes
+ ;;
esac
;;
+dragonfly*)
-+ version_type=linux # XXX tv this should be =linux; current selection has problems
++ version_type=linux
+ need_version=no
+ need_lib_prefix=no
+ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}'
++ soname_spec='${libname}${release}${shared_ext}$major'
+ shlibpath_var=LD_LIBRARY_PATH
+ shlibpath_overrides_runpath=no
+ hardcode_into_libs=yes
@@ -487,7 +509,7 @@ $NetBSD: patch-ad,v 1.33 2008/11/19 01:26:52 chuck Exp $
gnu*)
version_type=linux
need_lib_prefix=no
-@@ -13694,15 +13832,22 @@ interix[3-9]*)
+@@ -13694,15 +13830,22 @@ interix[3-9]*)
hardcode_into_libs=yes
;;
@@ -516,7 +538,7 @@ $NetBSD: patch-ad,v 1.33 2008/11/19 01:26:52 chuck Exp $
esac
need_lib_prefix=no
need_version=no
-@@ -13767,11 +13912,11 @@ linux* | k*bsd*-gnu)
+@@ -13767,11 +13910,11 @@ linux* | k*bsd*-gnu)
;;
netbsd*)
@@ -530,7 +552,7 @@ $NetBSD: patch-ad,v 1.33 2008/11/19 01:26:52 chuck Exp $
finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir'
dynamic_linker='NetBSD (a.out) ld.so'
else
-@@ -13796,13 +13941,14 @@ nto-qnx*)
+@@ -13796,13 +13939,14 @@ nto-qnx*)
need_lib_prefix=no
need_version=no
library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
@@ -546,7 +568,7 @@ $NetBSD: patch-ad,v 1.33 2008/11/19 01:26:52 chuck Exp $
sys_lib_dlsearch_path_spec="/usr/lib"
need_lib_prefix=no
# Some older versions of OpenBSD (3.3 at least) *do* need versioned libs.
-@@ -13810,7 +13956,7 @@ openbsd*)
+@@ -13810,7 +13954,7 @@ openbsd*)
openbsd3.3 | openbsd3.3.*) need_version=yes ;;
*) need_version=no ;;
esac
@@ -555,7 +577,7 @@ $NetBSD: patch-ad,v 1.33 2008/11/19 01:26:52 chuck Exp $
finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir'
shlibpath_var=LD_LIBRARY_PATH
if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
-@@ -14528,7 +14674,10 @@ for cc_temp in $compiler""; do
+@@ -14528,7 +14672,10 @@ for cc_temp in $compiler""; do
*) break;;
esac
done
@@ -567,7 +589,7 @@ $NetBSD: patch-ad,v 1.33 2008/11/19 01:26:52 chuck Exp $
{ echo "$as_me:$LINENO: checking if libtool supports shared libraries" >&5
-@@ -14609,9 +14758,11 @@ echo $ECHO_N "checking for $compiler opt
+@@ -14609,9 +14756,11 @@ echo $ECHO_N "checking for $compiler opt
;;
darwin* | rhapsody*)
@@ -580,7 +602,7 @@ $NetBSD: patch-ad,v 1.33 2008/11/19 01:26:52 chuck Exp $
;;
interix[3-9]*)
-@@ -14645,6 +14796,11 @@ echo $ECHO_N "checking for $compiler opt
+@@ -14645,6 +14794,11 @@ echo $ECHO_N "checking for $compiler opt
esac
;;
@@ -592,7 +614,7 @@ $NetBSD: patch-ad,v 1.33 2008/11/19 01:26:52 chuck Exp $
*)
lt_prog_compiler_pic_F77='-fPIC'
;;
-@@ -14799,6 +14955,10 @@ echo $ECHO_N "checking for $compiler opt
+@@ -14799,6 +14953,10 @@ echo $ECHO_N "checking for $compiler opt
lt_prog_compiler_static_F77='-Bstatic'
;;
@@ -603,7 +625,7 @@ $NetBSD: patch-ad,v 1.33 2008/11/19 01:26:52 chuck Exp $
*)
lt_prog_compiler_can_build_shared_F77=no
;;
-@@ -15036,7 +15196,10 @@ echo $ECHO_N "checking whether the $comp
+@@ -15036,7 +15194,10 @@ echo $ECHO_N "checking whether the $comp
*) break;;
esac
done
@@ -615,7 +637,7 @@ $NetBSD: patch-ad,v 1.33 2008/11/19 01:26:52 chuck Exp $
case $host_os in
cygwin* | mingw* | pw32*)
-@@ -15205,6 +15368,17 @@ EOF
+@@ -15205,6 +15366,17 @@ EOF
fi
;;
@@ -633,7 +655,7 @@ $NetBSD: patch-ad,v 1.33 2008/11/19 01:26:52 chuck Exp $
netbsd*)
if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
archive_cmds_F77='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib'
-@@ -15270,6 +15444,11 @@ _LT_EOF
+@@ -15270,6 +15442,11 @@ _LT_EOF
hardcode_shlibpath_var_F77=no
;;
@@ -645,7 +667,7 @@ $NetBSD: patch-ad,v 1.33 2008/11/19 01:26:52 chuck Exp $
*)
if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
archive_cmds_F77='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
-@@ -15716,6 +15895,21 @@ if test -z "$aix_libpath"; then aix_libp
+@@ -15716,6 +15893,21 @@ if test -z "$aix_libpath"; then aix_libp
fi
;;
@@ -667,7 +689,7 @@ $NetBSD: patch-ad,v 1.33 2008/11/19 01:26:52 chuck Exp $
irix5* | irix6* | nonstopux*)
if test "$GCC" = yes; then
archive_cmds_F77='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
-@@ -15941,6 +16135,13 @@ if test -z "$aix_libpath"; then aix_libp
+@@ -15941,6 +16133,13 @@ if test -z "$aix_libpath"; then aix_libp
hardcode_shlibpath_var_F77=no
;;
@@ -681,7 +703,7 @@ $NetBSD: patch-ad,v 1.33 2008/11/19 01:26:52 chuck Exp $
*)
ld_shlibs_F77=no
;;
-@@ -16106,6 +16307,7 @@ beos*)
+@@ -16106,6 +16305,7 @@ beos*)
bsdi[45]*)
version_type=linux
need_version=no
@@ -689,16 +711,18 @@ $NetBSD: patch-ad,v 1.33 2008/11/19 01:26:52 chuck Exp $
library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
soname_spec='${libname}${release}${shared_ext}$major'
finish_cmds='PATH="\$PATH:/sbin" ldconfig $libdir'
-@@ -16203,7 +16405,7 @@ freebsd1*)
+@@ -16203,9 +16403,7 @@ freebsd1*)
dynamic_linker=no
;;
-freebsd* | dragonfly*)
+- # DragonFly does not have aout. When/if they implement a new
+- # versioning mechanism, adjust this.
+freebsd*)
- # DragonFly does not have aout. When/if they implement a new
- # versioning mechanism, adjust this.
if test -x /usr/bin/objformat; then
-@@ -16217,7 +16419,7 @@ freebsd* | dragonfly*)
+ objformat=`/usr/bin/objformat`
+ else
+@@ -16217,7 +16415,7 @@ freebsd* | dragonfly*)
version_type=freebsd-$objformat
case $version_type in
freebsd-elf*)
@@ -707,15 +731,24 @@ $NetBSD: patch-ad,v 1.33 2008/11/19 01:26:52 chuck Exp $
need_version=no
need_lib_prefix=no
;;
-@@ -16247,6 +16449,16 @@ freebsd* | dragonfly*)
+@@ -16240,13 +16438,24 @@ freebsd* | dragonfly*)
+ shlibpath_overrides_runpath=no
+ hardcode_into_libs=yes
+ ;;
+- *) # from 4.6 on, and DragonFly
++ *) # from 4.6 on
+ shlibpath_overrides_runpath=yes
+ hardcode_into_libs=yes
+ ;;
esac
;;
+dragonfly*)
-+ version_type=linux # XXX tv this should be =linux; current selection has problems
++ version_type=linux
+ need_version=no
+ need_lib_prefix=no
+ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}'
++ soname_spec='${libname}${release}${shared_ext}$major'
+ shlibpath_var=LD_LIBRARY_PATH
+ shlibpath_overrides_runpath=no
+ hardcode_into_libs=yes
@@ -724,7 +757,7 @@ $NetBSD: patch-ad,v 1.33 2008/11/19 01:26:52 chuck Exp $
gnu*)
version_type=linux
need_lib_prefix=no
-@@ -16315,15 +16527,22 @@ interix[3-9]*)
+@@ -16315,15 +16524,22 @@ interix[3-9]*)
hardcode_into_libs=yes
;;
@@ -753,7 +786,7 @@ $NetBSD: patch-ad,v 1.33 2008/11/19 01:26:52 chuck Exp $
esac
need_lib_prefix=no
need_version=no
-@@ -16388,11 +16607,11 @@ linux* | k*bsd*-gnu)
+@@ -16388,11 +16604,11 @@ linux* | k*bsd*-gnu)
;;
netbsd*)
@@ -767,7 +800,7 @@ $NetBSD: patch-ad,v 1.33 2008/11/19 01:26:52 chuck Exp $
finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir'
dynamic_linker='NetBSD (a.out) ld.so'
else
-@@ -16417,13 +16636,14 @@ nto-qnx*)
+@@ -16417,13 +16633,14 @@ nto-qnx*)
need_lib_prefix=no
need_version=no
library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
@@ -783,7 +816,7 @@ $NetBSD: patch-ad,v 1.33 2008/11/19 01:26:52 chuck Exp $
sys_lib_dlsearch_path_spec="/usr/lib"
need_lib_prefix=no
# Some older versions of OpenBSD (3.3 at least) *do* need versioned libs.
-@@ -16431,7 +16651,7 @@ openbsd*)
+@@ -16431,7 +16648,7 @@ openbsd*)
openbsd3.3 | openbsd3.3.*) need_version=yes ;;
*) need_version=no ;;
esac
@@ -792,7 +825,7 @@ $NetBSD: patch-ad,v 1.33 2008/11/19 01:26:52 chuck Exp $
finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir'
shlibpath_var=LD_LIBRARY_PATH
if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
-@@ -17109,7 +17329,10 @@ for cc_temp in $compiler""; do
+@@ -17109,7 +17326,10 @@ for cc_temp in $compiler""; do
*) break;;
esac
done
@@ -804,7 +837,7 @@ $NetBSD: patch-ad,v 1.33 2008/11/19 01:26:52 chuck Exp $
# GCJ did not exist at the time GCC didn't implicitly link libc in.
-@@ -17214,9 +17437,11 @@ echo $ECHO_N "checking for $compiler opt
+@@ -17214,9 +17434,11 @@ echo $ECHO_N "checking for $compiler opt
;;
darwin* | rhapsody*)
@@ -817,7 +850,7 @@ $NetBSD: patch-ad,v 1.33 2008/11/19 01:26:52 chuck Exp $
;;
interix[3-9]*)
-@@ -17250,6 +17475,11 @@ echo $ECHO_N "checking for $compiler opt
+@@ -17250,6 +17472,11 @@ echo $ECHO_N "checking for $compiler opt
esac
;;
@@ -829,7 +862,7 @@ $NetBSD: patch-ad,v 1.33 2008/11/19 01:26:52 chuck Exp $
*)
lt_prog_compiler_pic_GCJ='-fPIC'
;;
-@@ -17404,6 +17634,10 @@ echo $ECHO_N "checking for $compiler opt
+@@ -17404,6 +17631,10 @@ echo $ECHO_N "checking for $compiler opt
lt_prog_compiler_static_GCJ='-Bstatic'
;;
@@ -840,7 +873,7 @@ $NetBSD: patch-ad,v 1.33 2008/11/19 01:26:52 chuck Exp $
*)
lt_prog_compiler_can_build_shared_GCJ=no
;;
-@@ -17641,7 +17875,10 @@ echo $ECHO_N "checking whether the $comp
+@@ -17641,7 +17872,10 @@ echo $ECHO_N "checking whether the $comp
*) break;;
esac
done
@@ -852,7 +885,7 @@ $NetBSD: patch-ad,v 1.33 2008/11/19 01:26:52 chuck Exp $
case $host_os in
cygwin* | mingw* | pw32*)
-@@ -17810,6 +18047,17 @@ EOF
+@@ -17810,6 +18044,17 @@ EOF
fi
;;
@@ -870,7 +903,7 @@ $NetBSD: patch-ad,v 1.33 2008/11/19 01:26:52 chuck Exp $
netbsd*)
if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
archive_cmds_GCJ='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib'
-@@ -17875,6 +18123,11 @@ _LT_EOF
+@@ -17875,6 +18120,11 @@ _LT_EOF
hardcode_shlibpath_var_GCJ=no
;;
@@ -882,7 +915,7 @@ $NetBSD: patch-ad,v 1.33 2008/11/19 01:26:52 chuck Exp $
*)
if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
archive_cmds_GCJ='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
-@@ -18341,6 +18594,21 @@ if test -z "$aix_libpath"; then aix_libp
+@@ -18341,6 +18591,21 @@ if test -z "$aix_libpath"; then aix_libp
fi
;;
@@ -904,7 +937,7 @@ $NetBSD: patch-ad,v 1.33 2008/11/19 01:26:52 chuck Exp $
irix5* | irix6* | nonstopux*)
if test "$GCC" = yes; then
archive_cmds_GCJ='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
-@@ -18566,6 +18834,13 @@ if test -z "$aix_libpath"; then aix_libp
+@@ -18566,6 +18831,13 @@ if test -z "$aix_libpath"; then aix_libp
hardcode_shlibpath_var_GCJ=no
;;
@@ -918,7 +951,7 @@ $NetBSD: patch-ad,v 1.33 2008/11/19 01:26:52 chuck Exp $
*)
ld_shlibs_GCJ=no
;;
-@@ -18731,6 +19006,7 @@ beos*)
+@@ -18731,6 +19003,7 @@ beos*)
bsdi[45]*)
version_type=linux
need_version=no
@@ -926,16 +959,18 @@ $NetBSD: patch-ad,v 1.33 2008/11/19 01:26:52 chuck Exp $
library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
soname_spec='${libname}${release}${shared_ext}$major'
finish_cmds='PATH="\$PATH:/sbin" ldconfig $libdir'
-@@ -18828,7 +19104,7 @@ freebsd1*)
+@@ -18828,9 +19101,7 @@ freebsd1*)
dynamic_linker=no
;;
-freebsd* | dragonfly*)
+- # DragonFly does not have aout. When/if they implement a new
+- # versioning mechanism, adjust this.
+freebsd*)
- # DragonFly does not have aout. When/if they implement a new
- # versioning mechanism, adjust this.
if test -x /usr/bin/objformat; then
-@@ -18842,7 +19118,7 @@ freebsd* | dragonfly*)
+ objformat=`/usr/bin/objformat`
+ else
+@@ -18842,7 +19113,7 @@ freebsd* | dragonfly*)
version_type=freebsd-$objformat
case $version_type in
freebsd-elf*)
@@ -944,15 +979,24 @@ $NetBSD: patch-ad,v 1.33 2008/11/19 01:26:52 chuck Exp $
need_version=no
need_lib_prefix=no
;;
-@@ -18872,6 +19148,16 @@ freebsd* | dragonfly*)
+@@ -18865,13 +19136,24 @@ freebsd* | dragonfly*)
+ shlibpath_overrides_runpath=no
+ hardcode_into_libs=yes
+ ;;
+- *) # from 4.6 on, and DragonFly
++ *) # from 4.6 on
+ shlibpath_overrides_runpath=yes
+ hardcode_into_libs=yes
+ ;;
esac
;;
+dragonfly*)
-+ version_type=linux # XXX tv this should be =linux; current selection has problems
++ version_type=linux
+ need_version=no
+ need_lib_prefix=no
+ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}'
++ soname_spec='${libname}${release}${shared_ext}$major'
+ shlibpath_var=LD_LIBRARY_PATH
+ shlibpath_overrides_runpath=no
+ hardcode_into_libs=yes
@@ -961,7 +1005,7 @@ $NetBSD: patch-ad,v 1.33 2008/11/19 01:26:52 chuck Exp $
gnu*)
version_type=linux
need_lib_prefix=no
-@@ -18940,15 +19226,22 @@ interix[3-9]*)
+@@ -18940,15 +19222,22 @@ interix[3-9]*)
hardcode_into_libs=yes
;;
@@ -990,7 +1034,7 @@ $NetBSD: patch-ad,v 1.33 2008/11/19 01:26:52 chuck Exp $
esac
need_lib_prefix=no
need_version=no
-@@ -19013,11 +19306,11 @@ linux* | k*bsd*-gnu)
+@@ -19013,11 +19302,11 @@ linux* | k*bsd*-gnu)
;;
netbsd*)
@@ -1004,7 +1048,7 @@ $NetBSD: patch-ad,v 1.33 2008/11/19 01:26:52 chuck Exp $
finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir'
dynamic_linker='NetBSD (a.out) ld.so'
else
-@@ -19042,13 +19335,14 @@ nto-qnx*)
+@@ -19042,13 +19331,14 @@ nto-qnx*)
need_lib_prefix=no
need_version=no
library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
@@ -1020,7 +1064,7 @@ $NetBSD: patch-ad,v 1.33 2008/11/19 01:26:52 chuck Exp $
sys_lib_dlsearch_path_spec="/usr/lib"
need_lib_prefix=no
# Some older versions of OpenBSD (3.3 at least) *do* need versioned libs.
-@@ -19056,7 +19350,7 @@ openbsd*)
+@@ -19056,7 +19346,7 @@ openbsd*)
openbsd3.3 | openbsd3.3.*) need_version=yes ;;
*) need_version=no ;;
esac
@@ -1029,7 +1073,7 @@ $NetBSD: patch-ad,v 1.33 2008/11/19 01:26:52 chuck Exp $
finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir'
shlibpath_var=LD_LIBRARY_PATH
if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
-@@ -19733,7 +20027,10 @@ for cc_temp in $compiler""; do
+@@ -19733,7 +20023,10 @@ for cc_temp in $compiler""; do
*) break;;
esac
done
@@ -1041,7 +1085,7 @@ $NetBSD: patch-ad,v 1.33 2008/11/19 01:26:52 chuck Exp $
lt_cv_prog_compiler_c_o_RC=yes
-@@ -21414,7 +21711,7 @@ else
+@@ -21414,7 +21707,7 @@ else
# we want this `case' here to explicitly catch those versions.
libltdl_cv_sys_dlopen_deplibs=unknown
;;
@@ -1050,7 +1094,7 @@ $NetBSD: patch-ad,v 1.33 2008/11/19 01:26:52 chuck Exp $
libltdl_cv_sys_dlopen_deplibs=yes
;;
darwin*)
-@@ -21422,10 +21719,7 @@ else
+@@ -21422,10 +21715,7 @@ else
# If you are looking for one http://www.opendarwin.org/projects/dlcompat
libltdl_cv_sys_dlopen_deplibs=yes
;;
@@ -1062,7 +1106,7 @@ $NetBSD: patch-ad,v 1.33 2008/11/19 01:26:52 chuck Exp $
# GNU and its variants, using gnu ld.so (Glibc)
libltdl_cv_sys_dlopen_deplibs=yes
;;
-@@ -23981,22 +24275,21 @@ echo "$as_me: $ac_file is unchanged" >&6
+@@ -23981,22 +24271,21 @@ echo "$as_me: $ac_file is unchanged" >&6
fi
rm -f "$tmp/out12"
# Compute $ac_file's index in $config_headers.
@@ -1092,7 +1136,7 @@ $NetBSD: patch-ad,v 1.33 2008/11/19 01:26:52 chuck Exp $
sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{
s//\1/
q
-@@ -24033,7 +24326,7 @@ echo "$as_me: executing $ac_file command
+@@ -24033,7 +24322,7 @@ echo "$as_me: executing $ac_file command
# each Makefile.in and add a new line on top of each file to say so.
# Grep'ing the whole file is not good either: AIX grep has a line
# limit of 2048, but all sed's we know have understand at least 4000.
generated by cgit v1.2.3 (git 2.39.1) at 2024-08-24 20:53:44 +0000