mirror of
https://git.freebsd.org/ports.git
synced 2025-05-18 10:03:10 -04:00
9adb7c18c4
Releases notes at <https://www.schedmd.com/news.php>. Remark: MySQL is no more an option. Security: CVE-2023-49933 through CVE-2023-49938 Differential Revision: <https://reviews.freebsd.org/D42764>
242 lines
14 KiB
Text
242 lines
14 KiB
Text
--- configure.orig 2023-11-21 22:33:29 UTC
|
|
+++ configure
|
|
@@ -5513,7 +5513,7 @@ _ACEOF
|
|
/* end confdefs.h. */
|
|
$ac_c_conftest_c99_program
|
|
_ACEOF
|
|
-for ac_arg in '' -std=gnu99 -std=c99 -c99 -qlanglvl=extc1x -qlanglvl=extc99 -AC99 -D_STDC_C99=
|
|
+for ac_arg in '' -std=gnu99 -qlanglvl=extc1x -qlanglvl=extc99
|
|
do
|
|
CC="$ac_save_CC $ac_arg"
|
|
if ac_fn_c_try_compile "$LINENO"
|
|
@@ -6659,7 +6659,7 @@ _ACEOF
|
|
/* end confdefs.h. */
|
|
$ac_c_conftest_c99_program
|
|
_ACEOF
|
|
-for ac_arg in '' -std=gnu99 -std=c99 -c99 -qlanglvl=extc1x -qlanglvl=extc99 -AC99 -D_STDC_C99=
|
|
+for ac_arg in '' -std=gnu99 -qlanglvl=extc1x -qlanglvl=extc99
|
|
do
|
|
CC="$ac_save_CC $ac_arg"
|
|
if ac_fn_c_try_compile "$LINENO"
|
|
@@ -7270,7 +7270,7 @@ _ACEOF
|
|
/* end confdefs.h. */
|
|
$ac_cxx_conftest_cxx98_program
|
|
_ACEOF
|
|
-for ac_arg in '' -std=gnu++98 -std=c++98 -qlanglvl=extended -AA
|
|
+for ac_arg in '' -std=gnu++98 -qlanglvl=extended -AA
|
|
do
|
|
CXX="$ac_save_CXX $ac_arg"
|
|
if ac_fn_cxx_try_compile "$LINENO"
|
|
@@ -12320,7 +12320,7 @@ printf %s "checking whether the $compiler linker ($LD)
|
|
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=
|
|
@@ -12622,7 +12622,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
|
|
;;
|
|
|
|
@@ -12641,7 +12641,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
|
|
@@ -12670,7 +12670,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
|
|
@@ -12688,7 +12688,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
|
|
@@ -13344,7 +13344,7 @@ printf "%s\n" "$lt_cv_irix_exported_symbol" >&6; }
|
|
hardcode_direct_absolute=yes
|
|
if test -z "`echo __ELF__ | $CC -E - | $GREP __ELF__`"; 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
|
|
@@ -14194,7 +14194,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$major $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'
|
|
soname_spec='$libname$release$shared_ext$major'
|
|
need_version=no
|
|
need_lib_prefix=no
|
|
@@ -15345,7 +15345,7 @@ printf %s "checking whether stripping libraries is pos
|
|
old_striplib=
|
|
{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether stripping libraries is possible" >&5
|
|
printf %s "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"
|
|
{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5
|
|
@@ -15592,7 +15592,7 @@ module_expsym_cmds_CXX=
|
|
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
|
|
@@ -15806,7 +15806,7 @@ with_gnu_ld=$lt_cv_prog_gnu_ld
|
|
# archiving commands below assume that GNU ld is being used.
|
|
if test yes = "$with_gnu_ld"; 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'
|
|
@@ -16502,7 +16502,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=
|
|
@@ -16510,7 +16510,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
|
|
@@ -16542,7 +16542,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
|
|
|
|
@@ -16553,7 +16553,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'
|
|
@@ -16587,7 +16587,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
|
|
@@ -16655,7 +16655,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__`"; 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
|
|
@@ -18186,7 +18186,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$major $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'
|
|
soname_spec='$libname$release$shared_ext$major'
|
|
need_version=no
|
|
need_lib_prefix=no
|
|
@@ -21930,7 +21930,7 @@ case $host_os in
|
|
|
|
case $host_os in
|
|
|
|
- freebsd*)
|
|
+dragonfly* | freebsd*)
|
|
|
|
# -kthread: FreeBSD kernel threads (preferred to -pthread since SMP-able)
|
|
# lthread: LinuxThreads port on FreeBSD (also preferred to -pthread)
|
|
@@ -22897,24 +22897,19 @@ HDF5 support is being disabled (equivalent to --with-h
|
|
with_hdf5="no"
|
|
with_hdf5_fortran="no"
|
|
else
|
|
- HDF5_SHOW=$(eval $H5CC -show)
|
|
+ HDF5_SHOW=`$PKG_CONFIG --cflags hdf5 --libs hdf5`
|
|
|
|
- HDF5_CC=$(eval $H5CC -show | head -n 1 | $AWK '{print $1}')
|
|
- if test "$HDF5_CC" = "ccache"; then
|
|
- HDF5_CC=$(eval $H5CC -show | head -n 1 | $AWK '{print $2}')
|
|
- fi
|
|
+ HDF5_CC=$CC
|
|
|
|
|
|
- HDF5_VERSION=$(eval $H5CC -showconfig | $GREP 'HDF5 Version:' \
|
|
- | $AWK '{print $3}')
|
|
+ HDF5_VERSION=`$GREP 'HDF5 Version:' /usr/local/lib/libhdf5.settings \
|
|
+ | $AWK '{print $3}'`
|
|
|
|
- HDF5_tmp_flags=$(eval $H5CC -showconfig \
|
|
- | $GREP 'FLAGS\|Extra libraries:' \
|
|
- | $AWK -F: '{printf("%s "), $2}' )
|
|
+ HDF5_tmp_flags=`$GREP 'FLAGS\|Extra libraries:' /usr/local/lib/libhdf5.settings \
|
|
+ | $AWK -F: '{printf("%s "), $2}'`
|
|
|
|
- HDF5_tmp_inst=$(eval $H5CC -showconfig \
|
|
- | $GREP 'Installation point:' \
|
|
- | $AWK '{print $NF}' )
|
|
+ HDF5_tmp_inst=`$GREP 'Installation point:' /usr/local/lib/libhdf5.settings \
|
|
+ | $AWK '{print $NF}'`
|
|
|
|
HDF5_CPPFLAGS="-I${HDF5_tmp_inst}/include"
|
|
|
|
@@ -23062,7 +23057,7 @@ printf "%s\n" "$H5FC" >&6; }
|
|
with_hdf5_fortran="yes"
|
|
|
|
|
|
- for arg in `$H5FC -show`
|
|
+ for arg in `$PKG_CONFIG --cflags hdf5_fortran --libs hdf5_fortran`
|
|
do
|
|
case "$arg" in #(
|
|
-I*) echo $HDF5_FFLAGS | $GREP -e "$arg" >/dev/null \
|
|
@@ -23172,7 +23167,7 @@ fi
|
|
|
|
if test "$ax_compare_version" = "true" ; then
|
|
|
|
-printf "%s\n" "#define H5_NO_DEPRECATED_SYMBOLS 1" >>confdefs.h
|
|
+# Remove on FreeBSD ports because we use 1.12 with 1.10 API
|
|
|
|
else
|
|
printf "%s\n" "#define H5_USE_18_API 1" >>confdefs.h
|