summaryrefslogtreecommitdiff
path: root/devel/libtool/patches/patch-ad
diff options
context:
space:
mode:
Diffstat (limited to 'devel/libtool/patches/patch-ad')
-rw-r--r--devel/libtool/patches/patch-ad1018
1 files changed, 694 insertions, 324 deletions
diff --git a/devel/libtool/patches/patch-ad b/devel/libtool/patches/patch-ad
index 4b481b44edf..70b77400116 100644
--- a/devel/libtool/patches/patch-ad
+++ b/devel/libtool/patches/patch-ad
@@ -1,14 +1,9 @@
-$NetBSD: patch-ad,v 1.30 2006/12/15 11:28:52 dmcmahill Exp $
+$NetBSD: patch-ad,v 1.31 2007/09/15 12:11:45 joerg Exp $
---- libltdl/configure.orig 2005-12-18 22:13:59.000000000 +0000
-+++ libltdl/configure 2006-12-12 21:55:15.000000000 +0000
-@@ -77,5 +77,4 @@
- fi
- if test ! -f "$as_myself"; then
-- # FIXME: next line outputs $as_me, which is still unset.
- { echo "$as_me: error: cannot find myself; rerun with an absolute file name" >&2
- { (exit 1); exit 1; }; }
-@@ -590,9 +589,9 @@
+--- libltdl/configure.orig 2007-09-14 11:49:53.000000000 +0200
++++ libltdl/configure
+@@ -630,11 +630,11 @@ else
+
if test "X$echo" = Xecho; then
# We didn't find a better echo, so look for alternatives.
- if test "X`(print -r '\t') 2>/dev/null`" = 'X\t' &&
@@ -20,72 +15,29 @@ $NetBSD: patch-ad,v 1.30 2006/12/15 11:28:52 dmcmahill Exp $
+ echo='print -r -'
elif (test -f /bin/ksh || test -f /bin/ksh$ac_exeext) &&
test "X$CONFIG_SHELL" != X/bin/ksh; then
-@@ -1928,6 +1927,5 @@
- ## Automake Initialisation. ##
- ## ------------------------ ##
--am__api_version='1.9a'
--
-+am__api_version="1.9"
- # Find a good install program. We prefer a C program (faster),
- # so one script is as good as another. But avoid the broken or
-@@ -2081,28 +2079,24 @@
-
- if mkdir -p --version . >/dev/null 2>&1 && test ! -d ./--version; then
-- # We used to define $(mkdir_p) as `mkdir -p -- .', in order to
-+ # We used to keeping the `.' as first argument, in order to
- # allow $(mkdir_p) to be used without argument. As in
- # $(mkdir_p) $(somedir)
-- # where $(somedir) is conditionally defined. However we don't do
-- # that anymore.
-- # 1. before we restricted the check to GNU mkdir, `mkdir -p .' was
-- # reported to fail in read-only directories. The system where this
-- # happened has been forgotten.
-- # 2. in practice we call $(mkdir_p) on directories such as
-- # $(mkdir_p) "$(DESTDIR)$(somedir)"
-- # and we don't want to create $(DESTDIR) if $(somedir) is empty.
-- # To support the latter case, we have to write
-- # test -z "$(somedir)" || $(mkdir_p) "$(DESTDIR)$(somedir)"
-- # so $(mkdir_p) always has an argument.
-- # We will have better chances of detecting a missing test if
-- # $(mkdir_p) complains about missing arguments.
-- # 3. $(mkdir_p) is named after `mkdir -p' and we don't expect this
-- # to accept no argument.
-- # 4. having something like `mkdir .' in the output is unsightly.
-+ # where $(somedir) is conditionally defined. However this is wrong
-+ # for two reasons:
-+ # 1. if the package is installed by a user who cannot write `.'
-+ # make install will fail,
-+ # 2. the above comment should most certainly read
-+ # $(mkdir_p) $(DESTDIR)$(somedir)
-+ # so it does not work when $(somedir) is undefined and
-+ # $(DESTDIR) is not.
-+ # To support the latter case, we have to write
-+ # test -z "$(somedir)" || $(mkdir_p) $(DESTDIR)$(somedir),
-+ # so the `.' trick is pointless.
- mkdir_p='mkdir -p --'
- else
- # On NextStep and OpenStep, the `mkdir' command does not
- # recognize any option. It will interpret all options as
-- # directories to create.
-+ # directories to create, and then abort because `.' already
-+ # exists.
- for d in ./-p ./--version;
- do
-@@ -2236,5 +2230,5 @@
- MAKEINFO=${MAKEINFO-"${am_missing_run}makeinfo"}
-
--install_sh=${install_sh-"\$(SHELL) $am_aux_dir/install-sh"}
-+install_sh=${install_sh-"$am_aux_dir/install-sh"}
-
- # Installed binaries are usually stripped using `strip' when the user
-@@ -2336,5 +2330,5 @@
+ # If we have ksh, try running configure again with it.
+@@ -4393,6 +4393,10 @@ interix[3-9]*)
+ lt_cv_deplibs_check_method='match_pattern /lib[^/]+(\.so|\.a)$'
+ ;;
- fi
--INSTALL_STRIP_PROGRAM="\$(install_sh) -c -s"
-+INSTALL_STRIP_PROGRAM="\${SHELL} \$(install_sh) -c -s"
++interix3*)
++ lt_cv_deplibs_check_method='match_pattern /lib[^/]+(\.so|\.a)$'
++ ;;
++
+ irix5* | irix6* | nonstopux*)
+ case $LD in
+ *-32|*"-32 ") libmagic=32-bit;;
+@@ -4423,7 +4427,7 @@ newos6*)
+ ;;
- # We need awk for the "check" target. The system "awk" is bad on
-@@ -6222,10 +6216,5 @@
+ nto-qnx*)
+- lt_cv_deplibs_check_method=unknown
++ lt_cv_deplibs_check_method='match_pattern /lib[^/]+(\.so|S\.a)$'
+ ;;
+
+ openbsd*)
+@@ -6095,12 +6099,7 @@ else
+ fi
-
@@ -97,25 +49,29 @@ $NetBSD: patch-ad,v 1.30 2006/12/15 11:28:52 dmcmahill Exp $
+ac_ext=cpp
ac_cpp='$CXXCPP $CPPFLAGS'
ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-@@ -6461,6 +6450,4 @@
+ ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
+@@ -6326,8 +6325,6 @@ ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS
+ ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
-fi
-
ac_ext=f
-@@ -7439,5 +7426,9 @@
- esac
- done
--cc_basename=`$echo "X$cc_temp" | $Xsed -e 's%.*/%%' -e "s%^$host_alias-%%"`
-+
-+# Return the actual command name, not our pkgsrc wrapper name because several
-+# decisions are made only based on compiler names
-+new_cc_temp=`$cc_temp --wrappee-name 2>/dev/null` || new_cc_temp="$cc_temp"
-+cc_basename=`$echo "X$new_cc_temp" | $Xsed -e 's%.*/%%' -e "s%^$host_alias-%%"`
+ ac_compile='$F77 -c $FFLAGS conftest.$ac_ext >&5'
+@@ -7535,10 +7532,6 @@ _lt_linker_boilerplate=`cat conftest.err
+ $rm conftest*
+
+-## CAVEAT EMPTOR:
+-## There is no encapsulation within the following macros, do not change
+-## the running order or otherwise move them around unless you know exactly
+-## what you are doing...
-@@ -7740,7 +7731,9 @@
+ lt_prog_compiler_no_builtin_flag=
+
+@@ -7632,9 +7625,11 @@ echo $ECHO_N "checking for $compiler opt
+ ;;
darwin* | rhapsody*)
- # PIC is the default on this platform
@@ -126,59 +82,156 @@ $NetBSD: patch-ad,v 1.30 2006/12/15 11:28:52 dmcmahill Exp $
+ lt_prog_compiler_static=''
;;
-@@ -8146,5 +8139,9 @@
- esac
- done
--cc_basename=`$echo "X$cc_temp" | $Xsed -e 's%.*/%%' -e "s%^$host_alias-%%"`
+ interix[3-9]*)
+@@ -7668,6 +7663,11 @@ echo $ECHO_N "checking for $compiler opt
+ esac
+ ;;
+
++ interix3*)
++ # Interix 3.0-3.5 -fPIC option generates borked code.
++ # (Instead, shlibs are relocated at runtime.)
++ ;;
+
-+# Return the actual command name, not our pkgsrc wrapper name because several
-+# decisions are made only based on compiler names
-+new_cc_temp=`$cc_temp --wrappee-name 2>/dev/null` || new_cc_temp="$cc_temp"
-+cc_basename=`$echo "X$new_cc_temp" | $Xsed -e 's%.*/%%' -e "s%^$host_alias-%%"`
+ *)
+ lt_prog_compiler_pic='-fPIC'
+ ;;
+@@ -7822,6 +7822,10 @@ echo $ECHO_N "checking for $compiler opt
+ lt_prog_compiler_static='-Bstatic'
+ ;;
- case $host_os in
-@@ -8702,5 +8699,5 @@
- module_cmds='$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags'
- # Don't fix this by using the ld -exported_symbols_list flag, it doesn't exist in older darwin lds
-- archive_expsym_cmds='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -qmkshrobj $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-install_name ${wl}$rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
-+ archive_expsym_cmds='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -qmkshrobj $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-install_name ${wl}`echo $rpath/$soname` $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
- module_expsym_cmds='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
- ;;
-@@ -9232,4 +9229,5 @@
++ nto-qnx*)
++ lt_prog_compiler_pic='-fPIC'
++ ;;
++
+ *)
+ lt_prog_compiler_can_build_shared=no
+ ;;
+@@ -8227,6 +8231,17 @@ EOF
+ fi
+ ;;
+
++ interix3*)
++ # Oy, what a hack.
++ # Because shlibs are not compiled -fPIC due to broken code, we must
++ # choose an --image-base. Otherwise, 0x10000000 will be chosen for
++ # all libraries, leading to runtime relocations -- slow and very
++ # memory consuming. To do this, we pick a random 256KB-aligned
++ # start address between 0x50000000 and 0x6ffc0000 at link time.
++ archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-h,$soname ${wl}--image-base,$(($RANDOM %4096/2*262144+1342177280)) -o $lib'
++ archive_expsym_cmds='sed s,^,_, $export_symbols >$output_objdir/$soname.exp && $CC -shared $libobjs $deplibs $compiler_flags ${wl}-h,$soname ${wl}--retain-symbols-file $wl$output_objdir/$soname.exp ${wl}--image-base,$(($RANDOM %4096/2*262144+1342177280)) -o $lib'
++ ;;
++
+ netbsd*)
+ if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
+ archive_cmds='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib'
+@@ -8292,6 +8307,11 @@ _LT_EOF
+ hardcode_shlibpath_var=no
+ ;;
+
++ nto-qnx*)
++ archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
++ archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
++ ;;
++
+ *)
+ if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
+ archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
+@@ -8759,6 +8779,21 @@ if test -z "$aix_libpath"; then aix_libp
+ fi
+ ;;
+
++ interix3*)
++ # Oy, what a hack.
++ # Because shlibs are not compiled -fPIC due to broken code, we must
++ # choose an --image-base. Otherwise, 0x10000000 will be chosen for
++ # all libraries, leading to runtime relocations -- slow and very
++ # memory consuming. To do this, we pick a random 256KB-aligned
++ # start address between 0x50000000 and 0x6ffc0000 at link time.
++ archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}--image-base,$(($RANDOM %4096/2*262144+1342177280)) -o $lib'
++ archive_expsym_cmds='sed s,^,_, $export_symbols >$output_objdir/$soname.exp && $CC -shared $libobjs $deplibs $compiler_flags ${wl}-h,$soname ${wl}--retain-symbols-file $wl$output_objdir/$soname ${wl}--image-base,$(($RANDOM %4096/2*262144+1342177280)) -o $lib'
++ export_dynamic_flag_spec='${wl}-E'
++ hardcode_direct=yes
++ hardcode_libdir_flag_spec='${wl}-h,$libdir'
++ hardcode_shlibpath_var=no
++ ;;
++
+ irix5* | irix6* | nonstopux*)
+ if test "$GCC" = yes; then
+ archive_cmds='$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'
+@@ -8984,6 +9019,13 @@ if test -z "$aix_libpath"; then aix_libp
+ hardcode_shlibpath_var=no
+ ;;
+
++ nto-qnx*)
++ archive_cmds='$LD -shared -o $lib $libobjs $deplibs $linker_flags'
++ hardcode_libdir_flag_spec='-R$libdir'
++ hardcode_direct=yes
++ hardcode_shlibpath_var=no
++ ;;
++
+ *)
+ ld_shlibs=no
+ ;;
+@@ -9200,6 +9242,7 @@ beos*)
+ bsdi[45]*)
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'
-@@ -9357,13 +9355,14 @@
- esac
- fi
-- version_type=freebsd-$objformat
-- case $version_type in
-- freebsd-elf*)
+ finish_cmds='PATH="\$PATH:/sbin" ldconfig $libdir'
+@@ -9298,7 +9341,7 @@ freebsd1*)
+ dynamic_linker=no
+ ;;
+
+-freebsd* | dragonfly*)
++freebsd*)
+ # DragonFly does not have aout. When/if they implement a new
+ # versioning mechanism, adjust this.
+ if test -x /usr/bin/objformat; then
+@@ -9312,7 +9355,7 @@ freebsd* | dragonfly*)
+ version_type=freebsd-$objformat
+ case $version_type in
+ freebsd-elf*)
- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext} $libname${shared_ext}'
-+ version_type=linux
-+ case $objformat in
-+ elf*)
-+ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
-+ soname_spec='${libname}${release}${shared_ext}$major'
++ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}'
need_version=no
need_lib_prefix=no
;;
-- freebsd-*)
-- library_names_spec='${libname}${release}${shared_ext}$versuffix $libname${shared_ext}$versuffix'
-+ *)
-+ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix2'
- need_version=yes
- ;;
-@@ -9383,5 +9382,5 @@
- hardcode_into_libs=yes
- ;;
-- freebsd*) # from 4.6 on
-+ *) # from 4.6 on, and DragonFly
- shlibpath_overrides_runpath=yes
- hardcode_into_libs=yes
-@@ -9461,10 +9460,5 @@
+@@ -9342,6 +9385,16 @@ freebsd* | dragonfly*)
+ esac
+ ;;
+
++dragonfly*)
++ version_type=linux # XXX tv this should be =linux; current selection has problems
++ need_version=no
++ need_lib_prefix=no
++ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}'
++ shlibpath_var=LD_LIBRARY_PATH
++ shlibpath_overrides_runpath=no
++ hardcode_into_libs=yes
++ ;;
++
+ gnu*)
+ version_type=linux
+ need_lib_prefix=no
+@@ -9410,15 +9463,22 @@ interix[3-9]*)
+ hardcode_into_libs=yes
+ ;;
+
++interix3*)
++ version_type=linux
++ need_lib_prefix=no
++ need_version=no
++ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}'
++ soname_spec='${libname}${release}${shared_ext}$major'
++ dynamic_linker='Interix 3.x ld.so'
++ shlibpath_var=LD_LIBRARY_PATH
++ shlibpath_overrides_runpath=yes
++ hardcode_into_libs=yes
++ ;;
++
+ irix5* | irix6* | nonstopux*)
case $host_os in
nonstopux*) version_type=nonstopux ;;
- *)
@@ -190,7 +243,9 @@ $NetBSD: patch-ad,v 1.30 2006/12/15 11:28:52 dmcmahill Exp $
+ *) version_type=irix ;;
esac
need_lib_prefix=no
-@@ -9543,9 +9537,9 @@
+ need_version=no
+@@ -9483,11 +9543,11 @@ linux* | k*bsd*-gnu)
+ ;;
netbsd*)
- version_type=sunos
@@ -202,48 +257,62 @@ $NetBSD: patch-ad,v 1.30 2006/12/15 11:28:52 dmcmahill Exp $
+ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix2'
finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir'
dynamic_linker='NetBSD (a.out) ld.so'
-@@ -9578,5 +9572,5 @@
+ else
+@@ -9512,13 +9572,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}'
++ dynamic_linker='QNX libc.so'
+ soname_spec='${libname}${release}${shared_ext}$major'
+ shlibpath_var=LD_LIBRARY_PATH
+ shlibpath_overrides_runpath=yes
+ ;;
openbsd*)
- version_type=sunos
+ version_type=linux
sys_lib_dlsearch_path_spec="/usr/lib"
need_lib_prefix=no
-@@ -9586,5 +9580,5 @@
+ # Some older versions of OpenBSD (3.3 at least) *do* need versioned libs.
+@@ -9526,7 +9587,7 @@ openbsd*)
+ openbsd3.3 | openbsd3.3.*) need_version=yes ;;
*) need_version=no ;;
esac
- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix'
-+ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix2'
++ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}'
finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir'
shlibpath_var=LD_LIBRARY_PATH
-@@ -11178,7 +11172,5 @@
+ if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
+@@ -11096,9 +11157,7 @@ echo "$as_me: error: tag name \"$tagname
+
case $tagname in
CXX)
- if test -n "$CXX" && ( test "X$CXX" != "Xno" &&
- ( (test "X$CXX" = "Xg++" && `g++ -v >/dev/null 2>&1` ) ||
- (test "X$CXX" != "Xg++"))) ; then
-+ if test -n "$CXX" && test "X$CXX" != "Xno"; then
++ if test -n "$CXX" && test "X$CXX" != "Xno" ; then
ac_ext=cpp
ac_cpp='$CXXCPP $CPPFLAGS'
-@@ -11285,5 +11277,9 @@
- esac
- done
--cc_basename=`$echo "X$cc_temp" | $Xsed -e 's%.*/%%' -e "s%^$host_alias-%%"`
-+
-+# Return the actual command name, not our pkgsrc wrapper name because several
-+# decisions are made only based on compiler names
-+new_cc_temp=`$cc_temp --wrappee-name 2>/dev/null` || new_cc_temp="$cc_temp"
-+cc_basename=`$echo "X$new_cc_temp" | $Xsed -e 's%.*/%%' -e "s%^$host_alias-%%"`
-
-
-@@ -11777,5 +11773,5 @@
- module_cmds_CXX='$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags'
- # Don't fix this by using the ld -exported_symbols_list flag, it doesn't exist in older darwin lds
-- archive_expsym_cmds_CXX='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -qmkshrobj ${wl}-single_module $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-install_name ${wl}$rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
-+ archive_expsym_cmds_CXX='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -qmkshrobj ${wl}-single_module $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-install_name ${wl}`echo $rpath/$soname` $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
- module_expsym_cmds_CXX='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
- ;;
-@@ -12074,12 +12070,27 @@
+ ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
+@@ -11866,6 +11925,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'
+ ;;
++ interix3*)
++ # Oy, what a hack.
++ # Because shlibs are not compiled -fPIC due to broken code, we must
++ # choose an --image-base. Otherwise, 0x10000000 will be chosen for
++ # all libraries, leading to runtime relocations -- slow and very
++ # memory consuming. To do this, we pick a random 256KB-aligned
++ # start address between 0x50000000 and 0x6ffc0000 at link time.
++ archive_cmds_CXX='$CC -shared $libobjs $deplibs $compiler_flags ${wl}--image-base,$(($RANDOM %4096/2*262144+1342177280)) -o $lib'
++ archive_expsym_cmds_CXX='sed s,^,_, $export_symbols >$output_objdir/$soname.exp && $CC -shared $libobjs $deplibs $compiler_flags ${wl}-h,$soname ${wl}--retain-symbols-file $wl$output_objdir/$soname ${wl}--image-base,$(($RANDOM %4096/2*262144+1342177280)) -o $lib'
++ ;;
+ irix5* | irix6*)
+ case $cc_basename in
+ CC*)
+@@ -12019,14 +12088,29 @@ if test -z "$aix_libpath"; then aix_libp
+ ;;
netbsd*)
if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
+ # a.out is quite broken and goes directly to ld
@@ -273,18 +342,54 @@ $NetBSD: patch-ad,v 1.30 2006/12/15 11:28:52 dmcmahill Exp $
- output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | grep conftest.$objext | $SED -e "s:-lgcc -lc -lgcc::"'
;;
openbsd2*)
-@@ -12517,4 +12528,10 @@
- ;;
-
-+netbsd*)
-+ if test -n "$cpprt0_file"; then
-+ predep_objects_CXX=`eval echo $predep_objects_CXX | sed -e 's:/usr/lib/c++rt0.o:$cpprt0_file:'`
-+ fi
-+ ;;
+ # C++ shared libraries are fairly broken
+@@ -12339,6 +12423,11 @@ if test -z "$aix_libpath"; then aix_libp
+ # FIXME: insert proper C++ library support
+ ld_shlibs_CXX=no
+ ;;
++ nto-qnx*)
++ archive_cmds_CXX='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
++ archive_expsym_cmds_CXX='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
++ output_verbose_link_cmd='echo'
++ ;;
+ *)
+ # FIXME: insert proper C++ library support
+ ld_shlibs_CXX=no
+@@ -12351,10 +12440,6 @@ test "$ld_shlibs_CXX" = no && can_build_
+ GCC_CXX="$GXX"
+ LD_CXX="$LD"
+
+-## CAVEAT EMPTOR:
+-## There is no encapsulation within the following macros, do not change
+-## the running order or otherwise move them around unless you know exactly
+-## what you are doing...
+
+ cat > conftest.$ac_ext <<EOF
+ class Foo
+@@ -12449,6 +12534,21 @@ if { (eval echo "$as_me:$LINENO: \"$ac_c
+ esac
+ done
+
++ case "$host_os" in
++ netbsd*)
++ if test -n "$cpprt0_file"; then
++ predep_objects_CXX=`eval echo $predep_objects_CXX | sed -e 's:/usr/lib/c++rt0.o:$cpprt0_file:'`
++ fi
++ ;;
++ interix3*)
++ # Interix installs completely hosed .la files for C++, so rather than
++ # hack all around it, let's just trust "g++" to DTRT.
++ predep_objects_CXX=
++ postdep_objects_CXX=
++ postdeps_CXX=
++ ;;
++ esac
+
- solaris*)
- case $cc_basename in
-@@ -12569,7 +12586,9 @@
+ # Clean up.
+ rm -f a.out a.exe
+ else
+@@ -12554,9 +12654,11 @@ echo $ECHO_N "checking for $compiler opt
+ lt_prog_compiler_pic_CXX='-DDLL_EXPORT'
;;
darwin* | rhapsody*)
- # PIC is the default on this platform
@@ -295,41 +400,96 @@ $NetBSD: patch-ad,v 1.30 2006/12/15 11:28:52 dmcmahill Exp $
+ lt_prog_compiler_static_CXX=''
;;
*djgpp*)
-@@ -13191,4 +13210,5 @@
+ # DJGPP does not support shared libraries at all
+@@ -12582,6 +12684,10 @@ echo $ECHO_N "checking for $compiler opt
+ ;;
+ esac
+ ;;
++ interix3*)
++ # Interix 3.0-3.5 -fPIC option generates borked code.
++ # (Instead, shlibs are relocated at runtime.)
++ ;;
+ *)
+ lt_prog_compiler_pic_CXX='-fPIC'
+ ;;
+@@ -12660,6 +12766,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?
+ ;;
++ interix3*)
++ ;;
+ irix5* | irix6* | nonstopux*)
+ case $cc_basename in
+ CC*)
+@@ -12799,6 +12907,8 @@ echo $ECHO_N "checking for $compiler opt
+ ;;
+ vxworks*)
+ ;;
++ nto-qnx*)
++ ;;
+ *)
+ lt_prog_compiler_can_build_shared_CXX=no
+ ;;
+@@ -13171,6 +13281,7 @@ beos*)
+ bsdi[45]*)
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'
-@@ -13316,13 +13336,14 @@
- esac
- fi
-- version_type=freebsd-$objformat
-- case $version_type in
-- freebsd-elf*)
+ finish_cmds='PATH="\$PATH:/sbin" ldconfig $libdir'
+@@ -13268,7 +13379,7 @@ freebsd1*)
+ dynamic_linker=no
+ ;;
+
+-freebsd* | dragonfly*)
++freebsd*)
+ # DragonFly does not have aout. When/if they implement a new
+ # versioning mechanism, adjust this.
+ if test -x /usr/bin/objformat; then
+@@ -13282,7 +13393,7 @@ freebsd* | dragonfly*)
+ version_type=freebsd-$objformat
+ case $version_type in
+ freebsd-elf*)
- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext} $libname${shared_ext}'
-+ version_type=linux
-+ case $objformat in
-+ elf*)
-+ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
-+ soname_spec='${libname}${release}${shared_ext}$major'
++ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}'
need_version=no
need_lib_prefix=no
;;
-- freebsd-*)
-- library_names_spec='${libname}${release}${shared_ext}$versuffix $libname${shared_ext}$versuffix'
-+ *)
-+ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix2'
- need_version=yes
- ;;
-@@ -13342,5 +13363,5 @@
- hardcode_into_libs=yes
- ;;
-- freebsd*) # from 4.6 on
-+ *) # from 4.6 on, and DragonFly
- shlibpath_overrides_runpath=yes
- hardcode_into_libs=yes
-@@ -13420,10 +13441,5 @@
+@@ -13312,6 +13423,16 @@ freebsd* | dragonfly*)
+ esac
+ ;;
+
++dragonfly*)
++ version_type=linux # XXX tv this should be =linux; current selection has problems
++ need_version=no
++ need_lib_prefix=no
++ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}'
++ shlibpath_var=LD_LIBRARY_PATH
++ shlibpath_overrides_runpath=no
++ hardcode_into_libs=yes
++ ;;
++
+ gnu*)
+ version_type=linux
+ need_lib_prefix=no
+@@ -13380,15 +13501,22 @@ interix[3-9]*)
+ hardcode_into_libs=yes
+ ;;
+
++interix3*)
++ version_type=linux
++ need_lib_prefix=no
++ need_version=no
++ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}'
++ soname_spec='${libname}${release}${shared_ext}$major'
++ dynamic_linker='Interix 3.x ld.so'
++ shlibpath_var=LD_LIBRARY_PATH
++ shlibpath_overrides_runpath=yes
++ hardcode_into_libs=yes
++ ;;
++
+ irix5* | irix6* | nonstopux*)
case $host_os in
nonstopux*) version_type=nonstopux ;;
- *)
@@ -341,7 +501,9 @@ $NetBSD: patch-ad,v 1.30 2006/12/15 11:28:52 dmcmahill Exp $
+ *) version_type=irix ;;
esac
need_lib_prefix=no
-@@ -13502,9 +13518,9 @@
+ need_version=no
+@@ -13453,11 +13581,11 @@ linux* | k*bsd*-gnu)
+ ;;
netbsd*)
- version_type=sunos
@@ -353,32 +515,34 @@ $NetBSD: patch-ad,v 1.30 2006/12/15 11:28:52 dmcmahill Exp $
+ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix2'
finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir'
dynamic_linker='NetBSD (a.out) ld.so'
-@@ -13537,5 +13553,5 @@
+ else
+@@ -13482,13 +13610,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}'
++ dynamic_linker='QNX libc.so'
+ soname_spec='${libname}${release}${shared_ext}$major'
+ shlibpath_var=LD_LIBRARY_PATH
+ shlibpath_overrides_runpath=yes
+ ;;
openbsd*)
- version_type=sunos
+ version_type=linux
sys_lib_dlsearch_path_spec="/usr/lib"
need_lib_prefix=no
-@@ -13545,5 +13561,5 @@
+ # Some older versions of OpenBSD (3.3 at least) *do* need versioned libs.
+@@ -13496,7 +13625,7 @@ openbsd*)
+ openbsd3.3 | openbsd3.3.*) need_version=yes ;;
*) need_version=no ;;
esac
- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix'
-+ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix2'
++ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}'
finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir'
shlibpath_var=LD_LIBRARY_PATH
-@@ -14231,5 +14247,9 @@
- esac
- done
--cc_basename=`$echo "X$cc_temp" | $Xsed -e 's%.*/%%' -e "s%^$host_alias-%%"`
-+
-+# Return the actual command name, not our pkgsrc wrapper name because several
-+# decisions are made only based on compiler names
-+new_cc_temp=`$cc_temp --wrappee-name 2>/dev/null` || new_cc_temp="$cc_temp"
-+cc_basename=`$echo "X$new_cc_temp" | $Xsed -e 's%.*/%%' -e "s%^$host_alias-%%"`
-
-
-@@ -14310,7 +14330,9 @@
+ if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
+@@ -14275,9 +14404,11 @@ echo $ECHO_N "checking for $compiler opt
+ ;;
darwin* | rhapsody*)
- # PIC is the default on this platform
@@ -389,59 +553,156 @@ $NetBSD: patch-ad,v 1.30 2006/12/15 11:28:52 dmcmahill Exp $
+ lt_prog_compiler_static_F77=''
;;
-@@ -14716,5 +14738,9 @@
- esac
- done
--cc_basename=`$echo "X$cc_temp" | $Xsed -e 's%.*/%%' -e "s%^$host_alias-%%"`
+ interix[3-9]*)
+@@ -14311,6 +14442,11 @@ echo $ECHO_N "checking for $compiler opt
+ esac
+ ;;
+
++ interix3*)
++ # Interix 3.0-3.5 -fPIC option generates borked code.
++ # (Instead, shlibs are relocated at runtime.)
++ ;;
++
+ *)
+ lt_prog_compiler_pic_F77='-fPIC'
+ ;;
+@@ -14465,6 +14601,10 @@ echo $ECHO_N "checking for $compiler opt
+ lt_prog_compiler_static_F77='-Bstatic'
+ ;;
+
++ nto-qnx*)
++ lt_prog_compiler_pic_F77='-fPIC'
++ ;;
+
-+# Return the actual command name, not our pkgsrc wrapper name because several
-+# decisions are made only based on compiler names
-+new_cc_temp=`$cc_temp --wrappee-name 2>/dev/null` || new_cc_temp="$cc_temp"
-+cc_basename=`$echo "X$new_cc_temp" | $Xsed -e 's%.*/%%' -e "s%^$host_alias-%%"`
+ *)
+ lt_prog_compiler_can_build_shared_F77=no
+ ;;
+@@ -14870,6 +15010,17 @@ EOF
+ fi
+ ;;
- case $host_os in
-@@ -15252,5 +15278,5 @@
- module_cmds_F77='$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags'
- # Don't fix this by using the ld -exported_symbols_list flag, it doesn't exist in older darwin lds
-- archive_expsym_cmds_F77='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -qmkshrobj $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-install_name ${wl}$rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
-+ archive_expsym_cmds_F77='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -qmkshrobj $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-install_name ${wl}`echo $rpath/$soname` $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
- module_expsym_cmds_F77='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
- ;;
-@@ -15782,4 +15808,5 @@
++ interix3*)
++ # Oy, what a hack.
++ # Because shlibs are not compiled -fPIC due to broken code, we must
++ # choose an --image-base. Otherwise, 0x10000000 will be chosen for
++ # all libraries, leading to runtime relocations -- slow and very
++ # memory consuming. To do this, we pick a random 256KB-aligned
++ # start address between 0x50000000 and 0x6ffc0000 at link time.
++ archive_cmds_F77='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-h,$soname ${wl}--image-base,$(($RANDOM %4096/2*262144+1342177280)) -o $lib'
++ archive_expsym_cmds_F77='sed s,^,_, $export_symbols >$output_objdir/$soname.exp && $CC -shared $libobjs $deplibs $compiler_flags ${wl}-h,$soname ${wl}--retain-symbols-file $wl$output_objdir/$soname.exp ${wl}--image-base,$(($RANDOM %4096/2*262144+1342177280)) -o $lib'
++ ;;
++
+ netbsd*)
+ if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
+ archive_cmds_F77='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib'
+@@ -14935,6 +15086,11 @@ _LT_EOF
+ hardcode_shlibpath_var_F77=no
+ ;;
+
++ nto-qnx*)
++ archive_cmds_F77='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
++ archive_expsym_cmds_F77='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
++ ;;
++
+ *)
+ 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'
+@@ -15382,6 +15538,21 @@ if test -z "$aix_libpath"; then aix_libp
+ fi
+ ;;
+
++ interix3*)
++ # Oy, what a hack.
++ # Because shlibs are not compiled -fPIC due to broken code, we must
++ # choose an --image-base. Otherwise, 0x10000000 will be chosen for
++ # all libraries, leading to runtime relocations -- slow and very
++ # memory consuming. To do this, we pick a random 256KB-aligned
++ # start address between 0x50000000 and 0x6ffc0000 at link time.
++ archive_cmds_F77='$CC -shared $libobjs $deplibs $compiler_flags ${wl}--image-base,$(($RANDOM %4096/2*262144+1342177280)) -o $lib'
++ archive_expsym_cmds_F77='sed s,^,_, $export_symbols >$output_objdir/$soname.exp && $CC -shared $libobjs $deplibs $compiler_flags ${wl}-h,$soname ${wl}--retain-symbols-file $wl$output_objdir/$soname ${wl}--image-base,$(($RANDOM %4096/2*262144+1342177280)) -o $lib'
++ export_dynamic_flag_spec_F77='${wl}-E'
++ hardcode_direct_F77=yes
++ hardcode_libdir_flag_spec_F77='${wl}-h,$libdir'
++ hardcode_shlibpath_var_F77=no
++ ;;
++
+ 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'
+@@ -15607,6 +15778,13 @@ if test -z "$aix_libpath"; then aix_libp
+ hardcode_shlibpath_var_F77=no
+ ;;
+
++ nto-qnx*)
++ archive_cmds_F77='$LD -shared -o $lib $libobjs $deplibs $linker_flags'
++ hardcode_libdir_flag_spec_F77='-R$libdir'
++ hardcode_direct_F77=yes
++ hardcode_shlibpath_var_F77=no
++ ;;
++
+ *)
+ ld_shlibs_F77=no
+ ;;
+@@ -15772,6 +15950,7 @@ beos*)
+ bsdi[45]*)
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'
-@@ -15907,13 +15934,14 @@
- esac
- fi
-- version_type=freebsd-$objformat
-- case $version_type in
-- freebsd-elf*)
+ finish_cmds='PATH="\$PATH:/sbin" ldconfig $libdir'
+@@ -15869,7 +16048,7 @@ freebsd1*)
+ dynamic_linker=no
+ ;;
+
+-freebsd* | dragonfly*)
++freebsd*)
+ # DragonFly does not have aout. When/if they implement a new
+ # versioning mechanism, adjust this.
+ if test -x /usr/bin/objformat; then
+@@ -15883,7 +16062,7 @@ freebsd* | dragonfly*)
+ version_type=freebsd-$objformat
+ case $version_type in
+ freebsd-elf*)
- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext} $libname${shared_ext}'
-+ version_type=linux
-+ case $objformat in
-+ elf*)
-+ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
-+ soname_spec='${libname}${release}${shared_ext}$major'
++ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}'
need_version=no
need_lib_prefix=no
;;
-- freebsd-*)
-- library_names_spec='${libname}${release}${shared_ext}$versuffix $libname${shared_ext}$versuffix'
-+ *)
-+ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix2'
- need_version=yes
- ;;
-@@ -15933,5 +15961,5 @@
- hardcode_into_libs=yes
- ;;
-- freebsd*) # from 4.6 on
-+ *) # from 4.6 on, and DragonFly
- shlibpath_overrides_runpath=yes
- hardcode_into_libs=yes
-@@ -16011,10 +16039,5 @@
+@@ -15913,6 +16092,16 @@ freebsd* | dragonfly*)
+ esac
+ ;;
+
++dragonfly*)
++ version_type=linux # XXX tv this should be =linux; current selection has problems
++ need_version=no
++ need_lib_prefix=no
++ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}'
++ shlibpath_var=LD_LIBRARY_PATH
++ shlibpath_overrides_runpath=no
++ hardcode_into_libs=yes
++ ;;
++
+ gnu*)
+ version_type=linux
+ need_lib_prefix=no
+@@ -15981,15 +16170,22 @@ interix[3-9]*)
+ hardcode_into_libs=yes
+ ;;
+
++interix3*)
++ version_type=linux
++ need_lib_prefix=no
++ need_version=no
++ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}'
++ soname_spec='${libname}${release}${shared_ext}$major'
++ dynamic_linker='Interix 3.x ld.so'
++ shlibpath_var=LD_LIBRARY_PATH
++ shlibpath_overrides_runpath=yes
++ hardcode_into_libs=yes
++ ;;
++
+ irix5* | irix6* | nonstopux*)
case $host_os in
nonstopux*) version_type=nonstopux ;;
- *)
@@ -453,7 +714,9 @@ $NetBSD: patch-ad,v 1.30 2006/12/15 11:28:52 dmcmahill Exp $
+ *) version_type=irix ;;
esac
need_lib_prefix=no
-@@ -16093,9 +16116,9 @@
+ need_version=no
+@@ -16054,11 +16250,11 @@ linux* | k*bsd*-gnu)
+ ;;
netbsd*)
- version_type=sunos
@@ -465,32 +728,45 @@ $NetBSD: patch-ad,v 1.30 2006/12/15 11:28:52 dmcmahill Exp $
+ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix2'
finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir'
dynamic_linker='NetBSD (a.out) ld.so'
-@@ -16128,5 +16151,5 @@
+ else
+@@ -16083,13 +16279,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}'
++ dynamic_linker='QNX libc.so'
+ soname_spec='${libname}${release}${shared_ext}$major'
+ shlibpath_var=LD_LIBRARY_PATH
+ shlibpath_overrides_runpath=yes
+ ;;
openbsd*)
- version_type=sunos
+ version_type=linux
sys_lib_dlsearch_path_spec="/usr/lib"
need_lib_prefix=no
-@@ -16136,5 +16159,5 @@
+ # Some older versions of OpenBSD (3.3 at least) *do* need versioned libs.
+@@ -16097,7 +16294,7 @@ openbsd*)
+ openbsd3.3 | openbsd3.3.*) need_version=yes ;;
*) need_version=no ;;
esac
- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix'
-+ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix2'
++ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}'
finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir'
shlibpath_var=LD_LIBRARY_PATH
-@@ -16789,5 +16812,9 @@
- esac
- done
--cc_basename=`$echo "X$cc_temp" | $Xsed -e 's%.*/%%' -e "s%^$host_alias-%%"`
-+
-+# Return the actual command name, not our pkgsrc wrapper name because several
-+# decisions are made only based on compiler names
-+new_cc_temp=`$cc_temp --wrappee-name 2>/dev/null` || new_cc_temp="$cc_temp"
-+cc_basename=`$echo "X$new_cc_temp" | $Xsed -e 's%.*/%%' -e "s%^$host_alias-%%"`
+ if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
+@@ -16763,10 +16960,6 @@ archive_cmds_need_lc_GCJ=no
+
+ old_archive_cmds_GCJ=$old_archive_cmds
+-## CAVEAT EMPTOR:
+-## There is no encapsulation within the following macros, do not change
+-## the running order or otherwise move them around unless you know exactly
+-## what you are doing...
-@@ -16892,7 +16919,9 @@
+ lt_prog_compiler_no_builtin_flag_GCJ=
+
+@@ -16860,9 +17053,11 @@ echo $ECHO_N "checking for $compiler opt
+ ;;
darwin* | rhapsody*)
- # PIC is the default on this platform
@@ -501,59 +777,156 @@ $NetBSD: patch-ad,v 1.30 2006/12/15 11:28:52 dmcmahill Exp $
+ lt_prog_compiler_static_GCJ=''
;;
-@@ -17298,5 +17327,9 @@
- esac
- done
--cc_basename=`$echo "X$cc_temp" | $Xsed -e 's%.*/%%' -e "s%^$host_alias-%%"`
+ interix[3-9]*)
+@@ -16896,6 +17091,11 @@ echo $ECHO_N "checking for $compiler opt
+ esac
+ ;;
+
++ interix3*)
++ # Interix 3.0-3.5 -fPIC option generates borked code.
++ # (Instead, shlibs are relocated at runtime.)
++ ;;
++
+ *)
+ lt_prog_compiler_pic_GCJ='-fPIC'
+ ;;
+@@ -17050,6 +17250,10 @@ echo $ECHO_N "checking for $compiler opt
+ lt_prog_compiler_static_GCJ='-Bstatic'
+ ;;
+
++ nto-qnx*)
++ lt_prog_compiler_pic_GCJ='-fPIC'
++ ;;
+
-+# Return the actual command name, not our pkgsrc wrapper name because several
-+# decisions are made only based on compiler names
-+new_cc_temp=`$cc_temp --wrappee-name 2>/dev/null` || new_cc_temp="$cc_temp"
-+cc_basename=`$echo "X$new_cc_temp" | $Xsed -e 's%.*/%%' -e "s%^$host_alias-%%"`
+ *)
+ lt_prog_compiler_can_build_shared_GCJ=no
+ ;;
+@@ -17455,6 +17659,17 @@ EOF
+ fi
+ ;;
- case $host_os in
-@@ -17854,5 +17887,5 @@
- module_cmds_GCJ='$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags'
- # Don't fix this by using the ld -exported_symbols_list flag, it doesn't exist in older darwin lds
-- archive_expsym_cmds_GCJ='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -qmkshrobj $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-install_name ${wl}$rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
-+ archive_expsym_cmds_GCJ='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -qmkshrobj $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-install_name ${wl}`echo $rpath/$soname` $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
- module_expsym_cmds_GCJ='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
- ;;
-@@ -18384,4 +18417,5 @@
++ interix3*)
++ # Oy, what a hack.
++ # Because shlibs are not compiled -fPIC due to broken code, we must
++ # choose an --image-base. Otherwise, 0x10000000 will be chosen for
++ # all libraries, leading to runtime relocations -- slow and very
++ # memory consuming. To do this, we pick a random 256KB-aligned
++ # start address between 0x50000000 and 0x6ffc0000 at link time.
++ archive_cmds_GCJ='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-h,$soname ${wl}--image-base,$(($RANDOM %4096/2*262144+1342177280)) -o $lib'
++ archive_expsym_cmds_GCJ='sed s,^,_, $export_symbols >$output_objdir/$soname.exp && $CC -shared $libobjs $deplibs $compiler_flags ${wl}-h,$soname ${wl}--retain-symbols-file $wl$output_objdir/$soname.exp ${wl}--image-base,$(($RANDOM %4096/2*262144+1342177280)) -o $lib'
++ ;;
++
+ netbsd*)
+ if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
+ archive_cmds_GCJ='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib'
+@@ -17520,6 +17735,11 @@ _LT_EOF
+ hardcode_shlibpath_var_GCJ=no
+ ;;
+
++ nto-qnx*)
++ archive_cmds_GCJ='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
++ archive_expsym_cmds_GCJ='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
++ ;;
++
+ *)
+ 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'
+@@ -17987,6 +18207,21 @@ if test -z "$aix_libpath"; then aix_libp
+ fi
+ ;;
+
++ interix3*)
++ # Oy, what a hack.
++ # Because shlibs are not compiled -fPIC due to broken code, we must
++ # choose an --image-base. Otherwise, 0x10000000 will be chosen for
++ # all libraries, leading to runtime relocations -- slow and very
++ # memory consuming. To do this, we pick a random 256KB-aligned
++ # start address between 0x50000000 and 0x6ffc0000 at link time.
++ archive_cmds_GCJ='$CC -shared $libobjs $deplibs $compiler_flags ${wl}--image-base,$(($RANDOM %4096/2*262144+1342177280)) -o $lib'
++ archive_expsym_cmds_GCJ='sed s,^,_, $export_symbols >$output_objdir/$soname.exp && $CC -shared $libobjs $deplibs $compiler_flags ${wl}-h,$soname ${wl}--retain-symbols-file $wl$output_objdir/$soname ${wl}--image-base,$(($RANDOM %4096/2*262144+1342177280)) -o $lib'
++ export_dynamic_flag_spec_GCJ='${wl}-E'
++ hardcode_direct_GCJ=yes
++ hardcode_libdir_flag_spec_GCJ='${wl}-h,$libdir'
++ hardcode_shlibpath_var_GCJ=no
++ ;;
++
+ 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'
+@@ -18212,6 +18447,13 @@ if test -z "$aix_libpath"; then aix_libp
+ hardcode_shlibpath_var_GCJ=no
+ ;;
+
++ nto-qnx*)
++ archive_cmds_GCJ='$LD -shared -o $lib $libobjs $deplibs $linker_flags'
++ hardcode_libdir_flag_spec_GCJ='-R$libdir'
++ hardcode_direct_GCJ=yes
++ hardcode_shlibpath_var_GCJ=no
++ ;;
++
+ *)
+ ld_shlibs_GCJ=no
+ ;;
+@@ -18377,6 +18619,7 @@ beos*)
+ bsdi[45]*)
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'
-@@ -18509,13 +18543,14 @@
- esac
- fi
-- version_type=freebsd-$objformat
-- case $version_type in
-- freebsd-elf*)
+ finish_cmds='PATH="\$PATH:/sbin" ldconfig $libdir'
+@@ -18474,7 +18717,7 @@ freebsd1*)
+ dynamic_linker=no
+ ;;
+
+-freebsd* | dragonfly*)
++freebsd*)
+ # DragonFly does not have aout. When/if they implement a new
+ # versioning mechanism, adjust this.
+ if test -x /usr/bin/objformat; then
+@@ -18488,7 +18731,7 @@ freebsd* | dragonfly*)
+ version_type=freebsd-$objformat
+ case $version_type in
+ freebsd-elf*)
- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext} $libname${shared_ext}'
-+ version_type=linux
-+ case $objformat in
-+ elf*)
-+ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
-+ soname_spec='${libname}${release}${shared_ext}$major'
++ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}'
need_version=no
need_lib_prefix=no
;;
-- freebsd-*)
-- library_names_spec='${libname}${release}${shared_ext}$versuffix $libname${shared_ext}$versuffix'
-+ *)
-+ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix2'
- need_version=yes
- ;;
-@@ -18535,5 +18570,5 @@
- hardcode_into_libs=yes
- ;;
-- freebsd*) # from 4.6 on
-+ *) # from 4.6 on, and DragonFly
- shlibpath_overrides_runpath=yes
- hardcode_into_libs=yes
-@@ -18613,10 +18648,5 @@
+@@ -18518,6 +18761,16 @@ freebsd* | dragonfly*)
+ esac
+ ;;
+
++dragonfly*)
++ version_type=linux # XXX tv this should be =linux; current selection has problems
++ need_version=no
++ need_lib_prefix=no
++ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}'
++ shlibpath_var=LD_LIBRARY_PATH
++ shlibpath_overrides_runpath=no
++ hardcode_into_libs=yes
++ ;;
++
+ gnu*)
+ version_type=linux
+ need_lib_prefix=no
+@@ -18586,15 +18839,22 @@ interix[3-9]*)
+ hardcode_into_libs=yes
+ ;;
+
++interix3*)
++ version_type=linux
++ need_lib_prefix=no
++ need_version=no
++ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}'
++ soname_spec='${libname}${release}${shared_ext}$major'
++ dynamic_linker='Interix 3.x ld.so'
++ shlibpath_var=LD_LIBRARY_PATH
++ shlibpath_overrides_runpath=yes
++ hardcode_into_libs=yes
++ ;;
++
+ irix5* | irix6* | nonstopux*)
case $host_os in
nonstopux*) version_type=nonstopux ;;
- *)
@@ -565,7 +938,9 @@ $NetBSD: patch-ad,v 1.30 2006/12/15 11:28:52 dmcmahill Exp $
+ *) version_type=irix ;;
esac
need_lib_prefix=no
-@@ -18695,9 +18725,9 @@
+ need_version=no
+@@ -18659,11 +18919,11 @@ linux* | k*bsd*-gnu)
+ ;;
netbsd*)
- version_type=sunos
@@ -577,34 +952,29 @@ $NetBSD: patch-ad,v 1.30 2006/12/15 11:28:52 dmcmahill Exp $
+ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix2'
finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir'
dynamic_linker='NetBSD (a.out) ld.so'
-@@ -18730,5 +18760,5 @@
+ else
+@@ -18688,13 +18948,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}'
++ dynamic_linker='QNX libc.so'
+ soname_spec='${libname}${release}${shared_ext}$major'
+ shlibpath_var=LD_LIBRARY_PATH
+ shlibpath_overrides_runpath=yes
+ ;;
openbsd*)
- version_type=sunos
+ version_type=linux
sys_lib_dlsearch_path_spec="/usr/lib"
need_lib_prefix=no
-@@ -18738,5 +18768,5 @@
+ # Some older versions of OpenBSD (3.3 at least) *do* need versioned libs.
+@@ -18702,7 +18963,7 @@ openbsd*)
+ openbsd3.3 | openbsd3.3.*) need_version=yes ;;
*) need_version=no ;;
esac
- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix'
-+ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix2'
++ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}'
finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir'
shlibpath_var=LD_LIBRARY_PATH
-@@ -19390,5 +19420,9 @@
- esac
- done
--cc_basename=`$echo "X$cc_temp" | $Xsed -e 's%.*/%%' -e "s%^$host_alias-%%"`
-+
-+# Return the actual command name, not our pkgsrc wrapper name because several
-+# decisions are made only based on compiler names
-+new_cc_temp=`$cc_temp --wrappee-name 2>/dev/null` || new_cc_temp="$cc_temp"
-+cc_basename=`$echo "X$new_cc_temp" | $Xsed -e 's%.*/%%' -e "s%^$host_alias-%%"`
-
- lt_cv_prog_compiler_c_o_RC=yes
-@@ -22720,5 +22754,4 @@
- fi
- if test ! -f "$as_myself"; then
-- # FIXME: next line outputs $as_me, which is still unset.
- { echo "$as_me: error: cannot find myself; rerun with an absolute file name" >&2
- { (exit 1); exit 1; }; }
+ if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then