c69300e480
to make decisions about which compiler is being used (gcc, SunPro, etc). To make this function "correctly" in the presence of the compiler wrapper scripts, we need to extract the actual compiler command from the wrapper frame work. So adapt the section in the configure script which already attempts to deal with some other compiler wrappers to deal with the pkgsrc wrappers. This should address PR pkg/33467 and PR pkg/34581. Bump PKGREVISION.
610 lines
26 KiB
Text
610 lines
26 KiB
Text
$NetBSD: patch-ad,v 1.30 2006/12/15 11:28:52 dmcmahill 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 @@
|
|
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' &&
|
|
+ if test "X`(print -r - '\t') 2>/dev/null`" = 'X\t' &&
|
|
echo_testing_string=`(print -r "$echo_test_string") 2>/dev/null` &&
|
|
test "X$echo_testing_string" = "X$echo_test_string"; then
|
|
# This shell has a builtin print -r that does the trick.
|
|
- echo='print -r'
|
|
+ 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 @@
|
|
|
|
fi
|
|
-INSTALL_STRIP_PROGRAM="\$(install_sh) -c -s"
|
|
+INSTALL_STRIP_PROGRAM="\${SHELL} \$(install_sh) -c -s"
|
|
|
|
# We need awk for the "check" target. The system "awk" is bad on
|
|
@@ -6222,10 +6216,5 @@
|
|
|
|
|
|
-
|
|
-
|
|
-if test -n "$CXX" && ( test "X$CXX" != "Xno" &&
|
|
- ( (test "X$CXX" = "Xg++" && `g++ -v >/dev/null 2>&1` ) ||
|
|
- (test "X$CXX" != "Xg++"))) ; then
|
|
- ac_ext=cpp
|
|
+ac_ext=cpp
|
|
ac_cpp='$CXXCPP $CPPFLAGS'
|
|
ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
|
|
@@ -6461,6 +6450,4 @@
|
|
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-%%"`
|
|
|
|
|
|
@@ -7740,7 +7731,9 @@
|
|
|
|
darwin* | rhapsody*)
|
|
- # PIC is the default on this platform
|
|
+ # PIC is the default on this platform, and static linking of
|
|
+ # binaries generally doesn't work
|
|
# Common symbols not allowed in MH_DYLIB files
|
|
lt_prog_compiler_pic='-fno-common'
|
|
+ lt_prog_compiler_static=''
|
|
;;
|
|
|
|
@@ -8146,5 +8139,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-%%"`
|
|
|
|
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 @@
|
|
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*)
|
|
- 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'
|
|
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 @@
|
|
case $host_os in
|
|
nonstopux*) version_type=nonstopux ;;
|
|
- *)
|
|
- if test "$lt_cv_prog_gnu_ld" = yes; then
|
|
- version_type=linux
|
|
- else
|
|
- version_type=irix
|
|
- fi ;;
|
|
+ *) version_type=irix ;;
|
|
esac
|
|
need_lib_prefix=no
|
|
@@ -9543,9 +9537,9 @@
|
|
|
|
netbsd*)
|
|
- version_type=sunos
|
|
+ version_type=linux
|
|
need_lib_prefix=no
|
|
need_version=no
|
|
if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
|
|
- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix'
|
|
+ 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 @@
|
|
|
|
openbsd*)
|
|
- version_type=sunos
|
|
+ version_type=linux
|
|
sys_lib_dlsearch_path_spec="/usr/lib"
|
|
need_lib_prefix=no
|
|
@@ -9586,5 +9580,5 @@
|
|
*) 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'
|
|
finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir'
|
|
shlibpath_var=LD_LIBRARY_PATH
|
|
@@ -11178,7 +11172,5 @@
|
|
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
|
|
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 @@
|
|
netbsd*)
|
|
if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
|
|
+ # a.out is quite broken and goes directly to ld
|
|
archive_cmds_CXX='$LD -Bshareable -o $lib $predep_objects $libobjs $deplibs $postdep_objects $linker_flags'
|
|
wlarc=
|
|
+ # Determine if we need to override the c++rt0 that is
|
|
+ # picked up by analysing output_verbose_link_cmds
|
|
+ if test -f ${PREFIX}/lib/c++rt0/c++rt0.o.PIC; then
|
|
+ cpprt0_file="${PREFIX}/lib/c++rt0/c++rt0.o.PIC"
|
|
+ else
|
|
+ cpprt0_file=
|
|
+ fi
|
|
hardcode_libdir_flag_spec_CXX='-R$libdir'
|
|
hardcode_direct_CXX=yes
|
|
hardcode_shlibpath_var_CXX=no
|
|
+ output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | grep conftest.$objext | $SED -e "s:-lgcc -lc -lgcc::"'
|
|
+ elif $CC -dumpspecs | grep -- '-lgcc -lc -lgcc' >/dev/null; then
|
|
+ # Workaround some broken pre-1.5 ELF toolchains
|
|
+ output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | grep conftest.$objext | $SED -e "s:-lgcc -lc -lgcc::"'
|
|
+ else
|
|
+ # Modern ELF works sanely as-is
|
|
+ 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'
|
|
fi
|
|
- # Workaround some broken pre-1.5 toolchains
|
|
- output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | grep conftest.$objext | $SED -e "s:-lgcc -lc -lgcc::"'
|
|
;;
|
|
openbsd2*)
|
|
@@ -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
|
|
+ ;;
|
|
+
|
|
solaris*)
|
|
case $cc_basename in
|
|
@@ -12569,7 +12586,9 @@
|
|
;;
|
|
darwin* | rhapsody*)
|
|
- # PIC is the default on this platform
|
|
+ # PIC is the default on this platform, and static linking of
|
|
+ # binaries generally doesn't work
|
|
# Common symbols not allowed in MH_DYLIB files
|
|
lt_prog_compiler_pic_CXX='-fno-common'
|
|
+ lt_prog_compiler_static_CXX=''
|
|
;;
|
|
*djgpp*)
|
|
@@ -13191,4 +13210,5 @@
|
|
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*)
|
|
- 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'
|
|
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 @@
|
|
case $host_os in
|
|
nonstopux*) version_type=nonstopux ;;
|
|
- *)
|
|
- if test "$lt_cv_prog_gnu_ld" = yes; then
|
|
- version_type=linux
|
|
- else
|
|
- version_type=irix
|
|
- fi ;;
|
|
+ *) version_type=irix ;;
|
|
esac
|
|
need_lib_prefix=no
|
|
@@ -13502,9 +13518,9 @@
|
|
|
|
netbsd*)
|
|
- version_type=sunos
|
|
+ version_type=linux
|
|
need_lib_prefix=no
|
|
need_version=no
|
|
if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
|
|
- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix'
|
|
+ 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 @@
|
|
|
|
openbsd*)
|
|
- version_type=sunos
|
|
+ version_type=linux
|
|
sys_lib_dlsearch_path_spec="/usr/lib"
|
|
need_lib_prefix=no
|
|
@@ -13545,5 +13561,5 @@
|
|
*) 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'
|
|
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 @@
|
|
|
|
darwin* | rhapsody*)
|
|
- # PIC is the default on this platform
|
|
+ # PIC is the default on this platform, and static linking of
|
|
+ # binaries generally doesn't work
|
|
# Common symbols not allowed in MH_DYLIB files
|
|
lt_prog_compiler_pic_F77='-fno-common'
|
|
+ lt_prog_compiler_static_F77=''
|
|
;;
|
|
|
|
@@ -14716,5 +14738,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-%%"`
|
|
|
|
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 @@
|
|
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*)
|
|
- 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'
|
|
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 @@
|
|
case $host_os in
|
|
nonstopux*) version_type=nonstopux ;;
|
|
- *)
|
|
- if test "$lt_cv_prog_gnu_ld" = yes; then
|
|
- version_type=linux
|
|
- else
|
|
- version_type=irix
|
|
- fi ;;
|
|
+ *) version_type=irix ;;
|
|
esac
|
|
need_lib_prefix=no
|
|
@@ -16093,9 +16116,9 @@
|
|
|
|
netbsd*)
|
|
- version_type=sunos
|
|
+ version_type=linux
|
|
need_lib_prefix=no
|
|
need_version=no
|
|
if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
|
|
- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix'
|
|
+ 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 @@
|
|
|
|
openbsd*)
|
|
- version_type=sunos
|
|
+ version_type=linux
|
|
sys_lib_dlsearch_path_spec="/usr/lib"
|
|
need_lib_prefix=no
|
|
@@ -16136,5 +16159,5 @@
|
|
*) 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'
|
|
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-%%"`
|
|
|
|
|
|
@@ -16892,7 +16919,9 @@
|
|
|
|
darwin* | rhapsody*)
|
|
- # PIC is the default on this platform
|
|
+ # PIC is the default on this platform, and static linking of
|
|
+ # binaries generally doesn't work
|
|
# Common symbols not allowed in MH_DYLIB files
|
|
lt_prog_compiler_pic_GCJ='-fno-common'
|
|
+ lt_prog_compiler_static_GCJ=''
|
|
;;
|
|
|
|
@@ -17298,5 +17327,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-%%"`
|
|
|
|
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 @@
|
|
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*)
|
|
- 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'
|
|
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 @@
|
|
case $host_os in
|
|
nonstopux*) version_type=nonstopux ;;
|
|
- *)
|
|
- if test "$lt_cv_prog_gnu_ld" = yes; then
|
|
- version_type=linux
|
|
- else
|
|
- version_type=irix
|
|
- fi ;;
|
|
+ *) version_type=irix ;;
|
|
esac
|
|
need_lib_prefix=no
|
|
@@ -18695,9 +18725,9 @@
|
|
|
|
netbsd*)
|
|
- version_type=sunos
|
|
+ version_type=linux
|
|
need_lib_prefix=no
|
|
need_version=no
|
|
if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
|
|
- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix'
|
|
+ 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 @@
|
|
|
|
openbsd*)
|
|
- version_type=sunos
|
|
+ version_type=linux
|
|
sys_lib_dlsearch_path_spec="/usr/lib"
|
|
need_lib_prefix=no
|
|
@@ -18738,5 +18768,5 @@
|
|
*) 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'
|
|
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; }; }
|