mirror of
https://git.freebsd.org/ports.git
synced 2025-06-27 15:40:32 -04:00
176 lines
12 KiB
Text
176 lines
12 KiB
Text
--- configure.orig 2015-07-15 20:30:20 UTC
|
|
+++ configure
|
|
@@ -10097,7 +10097,7 @@ $as_echo_n "checking whether the $compil
|
|
hardcode_minus_L=no
|
|
hardcode_shlibpath_var=unsupported
|
|
inherit_rpath=no
|
|
- link_all_deplibs=unknown
|
|
+ link_all_deplibs=no
|
|
module_cmds=
|
|
module_expsym_cmds=
|
|
old_archive_from_new_cmds=
|
|
@@ -10366,7 +10366,7 @@ _LT_EOF
|
|
wlarc=
|
|
else
|
|
archive_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
|
|
- archive_expsym_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
|
|
+ archive_expsym_cmds='echo "{ global:" > $lib-ver~ sed -e "s|$|;|" < $export_symbols >> $lib-ver~ echo "local: *; };" >> $lib-ver~$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-version-script $wl$lib-ver -o $lib'
|
|
fi
|
|
;;
|
|
|
|
@@ -10385,7 +10385,7 @@ _LT_EOF
|
|
_LT_EOF
|
|
elif $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then
|
|
archive_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
|
|
- archive_expsym_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
|
|
+ archive_expsym_cmds='echo "{ global:" > $lib-ver~ sed -e "s|$|;|" < $export_symbols >> $lib-ver~ echo "local: *; };" >> $lib-ver~$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-version-script $wl$lib-ver -o $lib'
|
|
else
|
|
ld_shlibs=no
|
|
fi
|
|
@@ -10414,7 +10414,7 @@ _LT_EOF
|
|
if $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then
|
|
hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir'
|
|
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'
|
|
+ archive_expsym_cmds='echo "{ global:" > $lib-ver~ sed -e "s|$|;|" < $export_symbols >> $lib-ver~ echo "local: *; };" >> $lib-ver~$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-version-script $wl$lib-ver -o $lib'
|
|
else
|
|
ld_shlibs=no
|
|
fi
|
|
@@ -10432,7 +10432,7 @@ _LT_EOF
|
|
*)
|
|
if $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then
|
|
archive_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
|
|
- archive_expsym_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
|
|
+ archive_expsym_cmds='echo "{ global:" > $lib-ver~ sed -e "s|$|;|" < $export_symbols >> $lib-ver~ echo "local: *; };" >> $lib-ver~$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-version-script $wl$lib-ver -o $lib'
|
|
else
|
|
ld_shlibs=no
|
|
fi
|
|
@@ -11020,7 +11020,7 @@ $as_echo "$lt_cv_irix_exported_symbol" >
|
|
hardcode_direct_absolute=yes
|
|
if test -z "`echo __ELF__ | $CC -E - | $GREP __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
|
|
archive_cmds='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags'
|
|
- archive_expsym_cmds='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-retain-symbols-file,$export_symbols'
|
|
+ archive_expsym_cmds='echo "{ global:" > $lib-ver~ sed -e "s|$|;|" < $export_symbols >> $lib-ver~ echo "local: *; };" >> $lib-ver~$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-version-script,$lib-ver'
|
|
hardcode_libdir_flag_spec='${wl}-rpath,$libdir'
|
|
export_dynamic_flag_spec='${wl}-E'
|
|
else
|
|
@@ -11798,7 +11798,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}'
|
|
+ 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
|
|
;;
|
|
@@ -12882,7 +12882,7 @@ striplib=
|
|
old_striplib=
|
|
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether stripping libraries is possible" >&5
|
|
$as_echo_n "checking whether stripping libraries is possible... " >&6; }
|
|
-if test -n "$STRIP" && $STRIP -V 2>&1 | $GREP "GNU strip" >/dev/null; then
|
|
+if test -n "$STRIP" && $STRIP -V 2>&1 | $GREP "strip" >/dev/null; then
|
|
test -z "$old_striplib" && old_striplib="$STRIP --strip-debug"
|
|
test -z "$striplib" && striplib="$STRIP --strip-unneeded"
|
|
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
|
|
@@ -13130,7 +13130,7 @@ hardcode_automatic_CXX=no
|
|
inherit_rpath_CXX=no
|
|
module_cmds_CXX=
|
|
module_expsym_cmds_CXX=
|
|
-link_all_deplibs_CXX=unknown
|
|
+link_all_deplibs_CXX=no
|
|
old_archive_cmds_CXX=$old_archive_cmds
|
|
reload_flag_CXX=$reload_flag
|
|
reload_cmds_CXX=$reload_cmds
|
|
@@ -13348,7 +13348,7 @@ with_gnu_ld=$lt_cv_prog_gnu_ld
|
|
# archiving commands below assume that GNU ld is being used.
|
|
if test "$with_gnu_ld" = yes; then
|
|
archive_cmds_CXX='$CC $pic_flag -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname -o $lib'
|
|
- archive_expsym_cmds_CXX='$CC $pic_flag -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
|
|
+ archive_expsym_cmds_CXX='echo "{ global:" > $lib-ver~ sed -e "s|$|;|" < $export_symbols >> $lib-ver~ echo "local: *; };" >> $lib-ver~$CC $pic_flag -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname ${wl}-version-script $wl$lib-ver -o $lib'
|
|
|
|
hardcode_libdir_flag_spec_CXX='${wl}-rpath ${wl}$libdir'
|
|
export_dynamic_flag_spec_CXX='${wl}--export-dynamic'
|
|
@@ -13964,7 +13964,7 @@ fi
|
|
case `$CC -V 2>&1` in
|
|
*"Version 7."*)
|
|
archive_cmds_CXX='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname -o $lib'
|
|
- archive_expsym_cmds_CXX='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
|
|
+ archive_expsym_cmds_CXX='echo "{ global:" > $lib-ver~ sed -e "s|$|;|" < $export_symbols >> $lib-ver~ echo "local: *; };" >> $lib-ver~$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname ${wl}-version-script $wl$lib-ver -o $lib'
|
|
;;
|
|
*) # Version 8.0 or newer
|
|
tmp_idyn=
|
|
@@ -13972,7 +13972,7 @@ fi
|
|
ia64*) tmp_idyn=' -i_dynamic';;
|
|
esac
|
|
archive_cmds_CXX='$CC -shared'"$tmp_idyn"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
|
|
- archive_expsym_cmds_CXX='$CC -shared'"$tmp_idyn"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
|
|
+ archive_expsym_cmds_CXX='echo "{ global:" > $lib-ver~ sed -e "s|$|;|" < $export_symbols >> $lib-ver~ echo "local: *; };" >> $lib-ver~$CC -shared'"$tmp_idyn"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-version-script $wl$lib-ver -o $lib'
|
|
;;
|
|
esac
|
|
archive_cmds_need_lc_CXX=no
|
|
@@ -14004,7 +14004,7 @@ fi
|
|
;;
|
|
*) # Version 6 and above use weak symbols
|
|
archive_cmds_CXX='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname -o $lib'
|
|
- archive_expsym_cmds_CXX='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname ${wl}-retain-symbols-file ${wl}$export_symbols -o $lib'
|
|
+ archive_expsym_cmds_CXX='echo "{ global:" > $lib-ver~ sed -e "s|$|;|" < $export_symbols >> $lib-ver~ echo "local: *; };" >> $lib-ver~$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname ${wl}-version-script ${wl}$lib-ver -o $lib'
|
|
;;
|
|
esac
|
|
|
|
@@ -14015,7 +14015,7 @@ fi
|
|
cxx*)
|
|
# Compaq C++
|
|
archive_cmds_CXX='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname -o $lib'
|
|
- archive_expsym_cmds_CXX='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname -o $lib ${wl}-retain-symbols-file $wl$export_symbols'
|
|
+ archive_expsym_cmds_CXX='echo "{ global:" > $lib-ver~ sed -e "s|$|;|" < $export_symbols >> $lib-ver~ echo "local: *; };" >> $lib-ver~$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname -o $lib ${wl}-version-script $wl$lib-ver'
|
|
|
|
runpath_var=LD_RUN_PATH
|
|
hardcode_libdir_flag_spec_CXX='-rpath $libdir'
|
|
@@ -14049,7 +14049,7 @@ fi
|
|
# Sun C++ 5.9
|
|
no_undefined_flag_CXX=' -zdefs'
|
|
archive_cmds_CXX='$CC -G${allow_undefined_flag} -h$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
|
|
- archive_expsym_cmds_CXX='$CC -G${allow_undefined_flag} -h$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-retain-symbols-file ${wl}$export_symbols'
|
|
+ archive_expsym_cmds_CXX='echo "{ global:" > $lib-ver~ sed -e "s|$|;|" < $export_symbols >> $lib-ver~ echo "local: *; };" >> $lib-ver~$CC -G${allow_undefined_flag} -h$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-version-script ${wl}$lib-ver'
|
|
hardcode_libdir_flag_spec_CXX='-R$libdir'
|
|
whole_archive_flag_spec_CXX='${wl}--whole-archive`new_convenience=; for conv in $convenience\"\"; do test -z \"$conv\" || new_convenience=\"$new_convenience,$conv\"; done; func_echo_all \"$new_convenience\"` ${wl}--no-whole-archive'
|
|
compiler_needs_object_CXX=yes
|
|
@@ -14122,7 +14122,7 @@ fi
|
|
archive_cmds_CXX='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $lib'
|
|
hardcode_libdir_flag_spec_CXX='${wl}-rpath,$libdir'
|
|
if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
|
|
- archive_expsym_cmds_CXX='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-retain-symbols-file,$export_symbols -o $lib'
|
|
+ archive_expsym_cmds_CXX='echo "{ global:" > $lib-ver~ sed -e "s|$|;|" < $export_symbols >> $lib-ver~ echo "local: *; };" >> $lib-ver~$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-version-script,$lib-ver -o $lib'
|
|
export_dynamic_flag_spec_CXX='${wl}-E'
|
|
whole_archive_flag_spec_CXX="$wlarc"'--whole-archive$convenience '"$wlarc"'--no-whole-archive'
|
|
fi
|
|
@@ -15630,7 +15630,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}'
|
|
+ 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
|
|
;;
|
|
@@ -16768,9 +16768,9 @@ _ACEOF
|
|
CXX_CPU_SWITCH=
|
|
if ! echo "X $CXXFLAGS " | grep -q -- " \(-march=\|-mcpu=\|-mtune=\|-arch=\)" ; then
|
|
if test "$def_arch_x86" = 1 -a "$host_cpu" != "x86_64"; then
|
|
- CXX_CPU_SWITCH="-march=$host_cpu"
|
|
+ CXX_CPU_SWITCH=
|
|
elif test "$target_cpu" = "ppc"; then
|
|
- CXX_CPU_SWITCH="-arch=$host_cpu"
|
|
+ CXX_CPU_SWITCH=
|
|
fi
|
|
fi
|
|
|
|
@@ -17482,7 +17482,7 @@ fi
|
|
# parser yacc tables.
|
|
if echo "$YACC" | grep -q bison; then
|
|
# NOTE: m4 removes [], that's why it needs to be escaped
|
|
- bison_version=`$YACC --version | head -n 1 | sed -e 's/[^0-9.]*\([-0-9.]\+\)$/\1/'`
|
|
+ bison_version=`$YACC --version | head -n 1 | sed -e 's/[^0-9.]*\([-0-9.]\+\)$/\1/' | sed -e 's/[[:alpha:][:space:]()]*//'`
|
|
bison_version_major=`echo $bison_version | cut -d. -f1`
|
|
bison_version_minor=`echo $bison_version | cut -d. -f2`
|
|
|