Skip to content

Commit f392d49

Browse files
sjlombardosjlombardo
committed
Merge branch 'sqlite-release' into 5a877221
2 parents b34ab30 + c17b466 commit f392d49

19 files changed

Lines changed: 246 additions & 111 deletions

‎VERSION‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
3.32.0
1+
3.32.1

‎aclocal.m4‎

Lines changed: 40 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -736,7 +736,6 @@ _LT_CONFIG_SAVE_COMMANDS([
736736
cat <<_LT_EOF >> "$cfgfile"
737737
#! $SHELL
738738
# Generated automatically by $as_me ($PACKAGE) $VERSION
739-
# Libtool was configured on host `(hostname || uname -n) 2>/dev/null | sed 1q`:
740739
# NOTE: Changes made to this file will be lost: look at ltmain.sh.
741740
742741
# Provide generalized library-building support services.
@@ -1048,8 +1047,8 @@ int forced_loaded() { return 2;}
10481047
_LT_EOF
10491048
echo "$LTCC $LTCFLAGS -c -o conftest.o conftest.c" >&AS_MESSAGE_LOG_FD
10501049
$LTCC $LTCFLAGS -c -o conftest.o conftest.c 2>&AS_MESSAGE_LOG_FD
1051-
echo "$AR cru libconftest.a conftest.o" >&AS_MESSAGE_LOG_FD
1052-
$AR cru libconftest.a conftest.o 2>&AS_MESSAGE_LOG_FD
1050+
echo "$AR cr libconftest.a conftest.o" >&AS_MESSAGE_LOG_FD
1051+
$AR cr libconftest.a conftest.o 2>&AS_MESSAGE_LOG_FD
10531052
echo "$RANLIB libconftest.a" >&AS_MESSAGE_LOG_FD
10541053
$RANLIB libconftest.a 2>&AS_MESSAGE_LOG_FD
10551054
cat > conftest.c << _LT_EOF
@@ -1499,7 +1498,7 @@ need_locks=$enable_libtool_lock
14991498
m4_defun([_LT_PROG_AR],
15001499
[AC_CHECK_TOOLS(AR, [ar], false)
15011500
: ${AR=ar}
1502-
: ${AR_FLAGS=cru}
1501+
: ${AR_FLAGS=cr}
15031502
_LT_DECL([], [AR], [1], [The archiver])
15041503
_LT_DECL([], [AR_FLAGS], [1], [Flags to create an archive])
15051504
@@ -2893,6 +2892,18 @@ linux* | k*bsd*-gnu | kopensolaris*-gnu | gnu*)
28932892
dynamic_linker='GNU/Linux ld.so'
28942893
;;
28952894
2895+
netbsdelf*-gnu)
2896+
version_type=linux
2897+
need_lib_prefix=no
2898+
need_version=no
2899+
library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}'
2900+
soname_spec='${libname}${release}${shared_ext}$major'
2901+
shlibpath_var=LD_LIBRARY_PATH
2902+
shlibpath_overrides_runpath=no
2903+
hardcode_into_libs=yes
2904+
dynamic_linker='NetBSD ld.elf_so'
2905+
;;
2906+
28962907
netbsd*)
28972908
version_type=sunos
28982909
need_lib_prefix=no
@@ -3552,7 +3563,7 @@ linux* | k*bsd*-gnu | kopensolaris*-gnu | gnu*)
35523563
lt_cv_deplibs_check_method=pass_all
35533564
;;
35543565
3555-
netbsd*)
3566+
netbsd* | netbsdelf*-gnu)
35563567
if echo __ELF__ | $CC -E - | $GREP __ELF__ > /dev/null; then
35573568
lt_cv_deplibs_check_method='match_pattern /lib[[^/]]+(\.so\.[[0-9]]+\.[[0-9]]+|_pic\.a)$'
35583569
else
@@ -4058,7 +4069,8 @@ _LT_EOF
40584069
if AC_TRY_EVAL(ac_compile); then
40594070
# Now try to grab the symbols.
40604071
nlist=conftest.nm
4061-
if AC_TRY_EVAL(NM conftest.$ac_objext \| "$lt_cv_sys_global_symbol_pipe" \> $nlist) && test -s "$nlist"; then
4072+
$ECHO "$as_me:$LINENO: $NM conftest.$ac_objext | $lt_cv_sys_global_symbol_pipe > $nlist" >&AS_MESSAGE_LOG_FD
4073+
if eval "$NM" conftest.$ac_objext \| "$lt_cv_sys_global_symbol_pipe" \> $nlist 2>&AS_MESSAGE_LOG_FD && test -s "$nlist"; then
40624074
# Try sorting and uniquifying the output.
40634075
if sort "$nlist" | uniq > "$nlist"T; then
40644076
mv -f "$nlist"T "$nlist"
@@ -4430,7 +4442,7 @@ m4_if([$1], [CXX], [
44304442
;;
44314443
esac
44324444
;;
4433-
netbsd*)
4445+
netbsd* | netbsdelf*-gnu)
44344446
;;
44354447
*qnx* | *nto*)
44364448
# QNX uses GNU C++, but need to define -shared option too, otherwise
@@ -4698,6 +4710,12 @@ m4_if([$1], [CXX], [
46984710
_LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
46994711
_LT_TAGVAR(lt_prog_compiler_static, $1)='-static'
47004712
;;
4713+
# flang / f18. f95 an alias for gfortran or flang on Debian
4714+
flang* | f18* | f95*)
4715+
_LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
4716+
_LT_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC'
4717+
_LT_TAGVAR(lt_prog_compiler_static, $1)='-static'
4718+
;;
47014719
# icc used to be incompatible with GCC.
47024720
# ICC 10 doesn't accept -KPIC any more.
47034721
icc* | ifort*)
@@ -4942,6 +4960,9 @@ m4_if([$1], [CXX], [
49424960
;;
49434961
esac
49444962
;;
4963+
linux* | k*bsd*-gnu | gnu*)
4964+
_LT_TAGVAR(link_all_deplibs, $1)=no
4965+
;;
49454966
*)
49464967
_LT_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols'
49474968
;;
@@ -5004,6 +5025,9 @@ dnl Note also adjust exclude_expsyms for C++ above.
50045025
openbsd* | bitrig*)
50055026
with_gnu_ld=no
50065027
;;
5028+
linux* | k*bsd*-gnu | gnu*)
5029+
_LT_TAGVAR(link_all_deplibs, $1)=no
5030+
;;
50075031
esac
50085032
50095033
_LT_TAGVAR(ld_shlibs, $1)=yes
@@ -5258,7 +5282,7 @@ _LT_EOF
52585282
fi
52595283
;;
52605284
5261-
netbsd*)
5285+
netbsd* | netbsdelf*-gnu)
52625286
if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null; then
52635287
_LT_TAGVAR(archive_cmds, $1)='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib'
52645288
wlarc=
@@ -5779,6 +5803,7 @@ _LT_EOF
57795803
if test yes = "$lt_cv_irix_exported_symbol"; then
57805804
_LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags $wl-soname $wl$soname `test -n "$verstring" && func_echo_all "$wl-set_version $wl$verstring"` $wl-update_registry $wl$output_objdir/so_locations $wl-exports_file $wl$export_symbols -o $lib'
57815805
fi
5806+
_LT_TAGVAR(link_all_deplibs, $1)=no
57825807
else
57835808
_LT_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry $output_objdir/so_locations -o $lib'
57845809
_LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry $output_objdir/so_locations -exports_file $export_symbols -o $lib'
@@ -5800,7 +5825,7 @@ _LT_EOF
58005825
esac
58015826
;;
58025827
5803-
netbsd*)
5828+
netbsd* | netbsdelf*-gnu)
58045829
if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null; then
58055830
_LT_TAGVAR(archive_cmds, $1)='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags' # a.out
58065831
else
@@ -6422,7 +6447,7 @@ if test yes != "$_lt_caught_CXX_error"; then
64226447
# Commands to make compiler produce verbose output that lists
64236448
# what "hidden" libraries, object files and flags are used when
64246449
# linking a shared library.
6425-
output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP -v "^Configured with:" | $GREP "\-L"'
6450+
output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP -v "^Configured with:" | $GREP " \-L"'
64266451
64276452
else
64286453
GXX=no
@@ -6797,7 +6822,7 @@ if test yes != "$_lt_caught_CXX_error"; then
67976822
# explicitly linking system object files so we need to strip them
67986823
# from the output so that they don't get included in the library
67996824
# dependencies.
6800-
output_verbose_link_cmd='templist=`($CC -b $CFLAGS -v conftest.$objext 2>&1) | $EGREP "\-L"`; list= ; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; func_echo_all "$list"'
6825+
output_verbose_link_cmd='templist=`($CC -b $CFLAGS -v conftest.$objext 2>&1) | $EGREP " \-L"`; list= ; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; func_echo_all "$list"'
68016826
;;
68026827
*)
68036828
if test yes = "$GXX"; then
@@ -6862,7 +6887,7 @@ if test yes != "$_lt_caught_CXX_error"; then
68626887
# explicitly linking system object files so we need to strip them
68636888
# from the output so that they don't get included in the library
68646889
# dependencies.
6865-
output_verbose_link_cmd='templist=`($CC -b $CFLAGS -v conftest.$objext 2>&1) | $GREP "\-L"`; list= ; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; func_echo_all "$list"'
6890+
output_verbose_link_cmd='templist=`($CC -b $CFLAGS -v conftest.$objext 2>&1) | $GREP " \-L"`; list= ; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; func_echo_all "$list"'
68666891
;;
68676892
*)
68686893
if test yes = "$GXX"; then
@@ -7201,7 +7226,7 @@ if test yes != "$_lt_caught_CXX_error"; then
72017226
# Commands to make compiler produce verbose output that lists
72027227
# what "hidden" libraries, object files and flags are used when
72037228
# linking a shared library.
7204-
output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP -v "^Configured with:" | $GREP "\-L"'
7229+
output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP -v "^Configured with:" | $GREP " \-L"'
72057230
72067231
else
72077232
# FIXME: insert proper C++ library support
@@ -7285,7 +7310,7 @@ if test yes != "$_lt_caught_CXX_error"; then
72857310
# Commands to make compiler produce verbose output that lists
72867311
# what "hidden" libraries, object files and flags are used when
72877312
# linking a shared library.
7288-
output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP -v "^Configured with:" | $GREP "\-L"'
7313+
output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP -v "^Configured with:" | $GREP " \-L"'
72897314
else
72907315
# g++ 2.7 appears to require '-G' NOT '-shared' on this
72917316
# platform.
@@ -7296,7 +7321,7 @@ if test yes != "$_lt_caught_CXX_error"; then
72967321
# Commands to make compiler produce verbose output that lists
72977322
# what "hidden" libraries, object files and flags are used when
72987323
# linking a shared library.
7299-
output_verbose_link_cmd='$CC -G $CFLAGS -v conftest.$objext 2>&1 | $GREP -v "^Configured with:" | $GREP "\-L"'
7324+
output_verbose_link_cmd='$CC -G $CFLAGS -v conftest.$objext 2>&1 | $GREP -v "^Configured with:" | $GREP " \-L"'
73007325
fi
73017326
73027327
_LT_TAGVAR(hardcode_libdir_flag_spec, $1)='$wl-R $wl$libdir'

0 commit comments

Comments
 (0)