Patch bundle accumulated via /chat: add missing --enable/disable-shared flag to configure script and update testrunner.tcl for other configure script flag changes.
FossilOrigin-Name: 32fc9c3f62601684b4ded783a79ebf817d093588c87ece02b449c3542881b65a
This commit is contained in:
stephan
parent
26d5652b56
commit
ccb1211b54
3
auto.def
3
auto.def
@ -164,6 +164,7 @@ set flags {
|
||||
editline=0 => {BSD editline support}
|
||||
readline=1 => {Disable readline support}
|
||||
largefile=1 => {Disable large file support}
|
||||
shared=1 => {Disable build of shared libary}
|
||||
with-readline-lib: => {Readline library}
|
||||
with-readline-inc: => {Readline include paths}
|
||||
with-linenoise:DIR => {}
|
||||
@ -343,7 +344,7 @@ if {"" eq [hwaci-bin-define install]} {
|
||||
# cross-compiling.
|
||||
define BUILD_CC [get-define CC_FOR_BUILD]
|
||||
define BUILD_CFLAGS [get-env BUILD_CFLAGS {-g}]
|
||||
define ENABLE_SHARED 1
|
||||
define ENABLE_SHARED [opt-bool shared]
|
||||
define HAVE_TCL 0
|
||||
|
||||
########################################################################
|
||||
|
||||
@ -42,7 +42,7 @@
|
||||
########################################################################
|
||||
|
||||
########################################################################
|
||||
# $hwaci is an internal-use-only array for storing whatever generic
|
||||
# $hwaci_ is an internal-use-only array for storing whatever generic
|
||||
# internal stuff we need stored.
|
||||
array set hwaci_ {}
|
||||
|
||||
|
||||
6
main.mk
6
main.mk
@ -329,8 +329,8 @@ T.link.shared = $(T.link) $(LDFLAGS.shobj)
|
||||
#
|
||||
LDFLAGS.libsqlite3 = \
|
||||
$(LDFLAGS.rpath) $(LDFLAGS.pthread) \
|
||||
$(LDFLAGS.math) $(LDFLAGS.dlopen)
|
||||
# $(LDFLAGS.zlib)
|
||||
$(LDFLAGS.math) $(LDFLAGS.dlopen) \
|
||||
$(LDFLAGS.zlib)
|
||||
|
||||
#
|
||||
# $(install-dir.XYZ) = dirs for installation.
|
||||
@ -1789,7 +1789,7 @@ sqlite3$(T.exe): shell.c sqlite3.c
|
||||
$(T.link) -o $@ \
|
||||
shell.c sqlite3.c \
|
||||
$(CFLAGS.readline) $(SHELL_OPT) \
|
||||
$(LDFLAGS.libsqlite3) $(LDFLAGS.zlib) $(LDFLAGS.readline) $(LDFLAGS.icu)
|
||||
$(LDFLAGS.libsqlite3) $(LDFLAGS.readline) $(LDFLAGS.icu)
|
||||
|
||||
#
|
||||
# Build sqlite3$(T.exe) by default except in wasi-sdk builds. Yes, the
|
||||
|
||||
20
manifest
20
manifest
@ -1,5 +1,5 @@
|
||||
C Fix\sa\sbug\sin\sthe\scomputation\sof\sLDFLAGS.libsqlite3\sintroduced\sby\s[63218898ed0a6d46].
|
||||
D 2024-10-26T11:18:29.408
|
||||
C Patch\sbundle\saccumulated\svia\s/chat:\sadd\smissing\s--enable/disable-shared\sflag\sto\sconfigure\sscript\sand\supdate\stestrunner.tcl\sfor\sother\sconfigure\sscript\sflag\schanges.
|
||||
D 2024-10-26T16:03:04.641
|
||||
F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
|
||||
F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
|
||||
F LICENSE.md b6e6c1baf38e4339bd3f1e0e5e5bfd0a9a93d133360691b2785c2d4b2f2dcec2
|
||||
@ -13,7 +13,7 @@ F art/icon-80x90.gif 65509ce3e5f86a9cd64fe7fca2d23954199f31fe44c1e09e208c80fb83d
|
||||
F art/sqlite370.eps aa97a671332b432a54e1d74ff5e8775be34200c2
|
||||
F art/sqlite370.ico af56c1d00fee7cd4753e8631ed60703ed0fc6e90
|
||||
F art/sqlite370.jpg d512473dae7e378a67e28ff96a34da7cb331def2
|
||||
F auto.def f3c94971e3559636a89276adaa9cfe949b1d83f72c300a21226f28377c56ec74
|
||||
F auto.def a8e0502e8bf821d88fcacc92d23a640f7256eb105d83fac80a4ec180fc85b1b3
|
||||
F autoconf/INSTALL 83e4a25da9fd053c7b3665eaaaf7919707915903
|
||||
F autoconf/Makefile.am adedc1324b6a87fdd1265ddd336d2fb7d4f36a0e77b86ea553ae7cc4ea239347
|
||||
F autoconf/Makefile.fallback 22fe523eb36dfce31e0f6349f782eb084e86a5620b2b0b4f84a2d6133f53f5ac
|
||||
@ -47,7 +47,7 @@ F autosetup/cc-lib.tcl 493c5935b5dd3bf9bd4eca89b07c8b1b1a9356d61783035144e21795f
|
||||
F autosetup/cc-shared.tcl 4f024e94a47f427ba61de1739f6381ef0080210f9fae89112d5c1de1e5460d78
|
||||
F autosetup/cc.tcl 7e2fe943ae9d45cf39e9f5b05b6230df8e719415edea5af06c30eb68680bde14
|
||||
F autosetup/default.auto 5cdf016de2140e50f1db190a02039dc42fb390af1dda4cc4853e3042a9ef0e82
|
||||
F autosetup/hwaci-common.tcl ed34d81dc51e8acc934d2101d9da5ded27ae7ae55a01a00896150bbfc7ca52da
|
||||
F autosetup/hwaci-common.tcl 80482a8b22b6853546bd36616f2064534a7c1f7b8537a52a8498a0b132f2e8f4
|
||||
F autosetup/jimsh0.c 27ea5f221359ef6c58780fc6c185aadbf8d3bee9a021331a3e5de0eba0dc6de6
|
||||
F autosetup/pkg-config.tcl 4e635bf39022ff65e0d5434339dd41503ea48fc53822c9c5bde88b02d3d952ba
|
||||
F autosetup/system.tcl 3a39d6e0b3bfba526fd39afe07c1d0d325e5a31925013a1ba7c671e1128e31bb
|
||||
@ -707,7 +707,7 @@ F ext/wasm/wasmfs.make bc8bb227f35d5bd3863a7bd2233437c37472a0d81585979f058f9b9b5
|
||||
F install-sh 9d4de14ab9fb0facae2f48780b874848cbf2f895 x
|
||||
F ltmain.sh 3ff0879076df340d2e23ae905484d8c15d5fdea8
|
||||
F magic.txt 5ade0bc977aa135e79e3faaea894d5671b26107cc91e70783aa7dc83f22f3ba0
|
||||
F main.mk 331edc29e1049d73c0cf362d8dbcc570794ff0cafca4ee0f4982089fa4b8f579
|
||||
F main.mk ac10e0b1ed32eac092009a69506637a06b10608ca406c2c126fdc9ad54d5d01b
|
||||
F mptest/config01.test 3c6adcbc50b991866855f1977ff172eb6d901271
|
||||
F mptest/config02.test 4415dfe36c48785f751e16e32c20b077c28ae504
|
||||
F mptest/crash01.test 61e61469e257df0850df4293d7d4d6c2af301421
|
||||
@ -1737,7 +1737,7 @@ F test/temptable3.test d11a0974e52b347e45ee54ef1923c91ed91e4637
|
||||
F test/temptrigger.test 38f0ca479b1822d3117069e014daabcaacefffcc
|
||||
F test/tester.tcl 7b44f1a9b9a2de8112695b908afc21dd9a68cd2d44e84b73f1b27b53492c0d59
|
||||
F test/testrunner.tcl bc1a8d21a1aa3a5cf7c4883cbee4b6748790fe960fad06ca5db74ec914bd6525 x
|
||||
F test/testrunner_data.tcl e3037f54cdb67479827cdfe8b8962a38811a496c1ad81956c085c64aa34e7a12
|
||||
F test/testrunner_data.tcl ba4aeea28aa03cfa6fe7e57782ddecb7a7b91c3a0b3251583cb4f0ee002de6a6
|
||||
F test/thread001.test a0985c117eab62c0c65526e9fa5d1360dd1cac5b03bde223902763274ce21899
|
||||
F test/thread002.test c24c83408e35ba5a952a3638b7ac03ccdf1ce4409289c54a050ac4c5f1de7502
|
||||
F test/thread003.test ee4c9efc3b86a6a2767516a37bd64251272560a7
|
||||
@ -2237,8 +2237,8 @@ F vsixtest/vsixtest.tcl 6195aba1f12a5e10efc2b8c0009532167be5e301abe5b31385638080
|
||||
F vsixtest/vsixtest.vcxproj.data 2ed517e100c66dc455b492e1a33350c1b20fbcdc
|
||||
F vsixtest/vsixtest.vcxproj.filters 37e51ffedcdb064aad6ff33b6148725226cd608e
|
||||
F vsixtest/vsixtest_TemporaryKey.pfx e5b1b036facdb453873e7084e1cae9102ccc67a0
|
||||
P 2801fb6507fc98730449168f3cf49495690e634c004c7074b4d45a0bd7513d41
|
||||
R 70bfdade4d808226e2272b78ae05fdf2
|
||||
U drh
|
||||
Z 8497a379d1e34c4657864ab74abb5b42
|
||||
P 58373d523cece0b39a29edcccecf93cfdc7ac68f9f12130ee8e487675d3f6a4d
|
||||
R 9f71a31c86e4b6aa4c47725d28cb3ea3
|
||||
U stephan
|
||||
Z 76974d6843a3a15446106276560473f0
|
||||
# Remove this line to create a well-formed Fossil manifest.
|
||||
|
||||
@ -1 +1 @@
|
||||
58373d523cece0b39a29edcccecf93cfdc7ac68f9f12130ee8e487675d3f6a4d
|
||||
32fc9c3f62601684b4ded783a79ebf817d093588c87ece02b449c3542881b65a
|
||||
|
||||
@ -72,11 +72,11 @@ namespace eval trd {
|
||||
# The following mirrors the set of test suites invoked by "all.test".
|
||||
#
|
||||
set all_configs {
|
||||
full no_optimization memsubsys1 memsubsys2 singlethread
|
||||
multithread onefile utf16 exclusive persistent_journal
|
||||
full no_optimization memsubsys1 memsubsys2 singlethread
|
||||
multithread onefile utf16 exclusive persistent_journal
|
||||
persistent_journal_error no_journal no_journal_error
|
||||
autovacuum_ioerr no_mutex_try fullmutex journaltest
|
||||
inmemory_journal pcache0 pcache10 pcache50 pcache90
|
||||
autovacuum_ioerr no_mutex_try fullmutex journaltest
|
||||
inmemory_journal pcache0 pcache10 pcache50 pcache90
|
||||
pcache100 prepare mmap
|
||||
}
|
||||
|
||||
@ -91,17 +91,17 @@ namespace eval trd {
|
||||
-DSQLITE_ENABLE_STMT_SCANSTATUS
|
||||
}
|
||||
|
||||
# These two are used by [testrunner.tcl mdevtest] (All-O0) and
|
||||
# These two are used by [testrunner.tcl mdevtest] (All-O0) and
|
||||
# [testrunner.tcl sdevtest] (All-Sanitize).
|
||||
#
|
||||
set build(All-Debug) {
|
||||
--enable-debug --enable-all
|
||||
--with-debug --enable-all
|
||||
-DSQLITE_ENABLE_ORDERED_SET_AGGREGATES
|
||||
}
|
||||
set build(All-O0) {
|
||||
-O0 --enable-all
|
||||
}
|
||||
set build(All-Sanitize) {
|
||||
set build(All-Sanitize) {
|
||||
-DSQLITE_OMIT_LOOKASIDE=1
|
||||
--enable-all -fsanitize=address,undefined -fno-sanitize-recover=undefined
|
||||
}
|
||||
@ -112,7 +112,7 @@ namespace eval trd {
|
||||
-DSQLITE_OMIT_LOOKASIDE=1
|
||||
-DCONFIG_SLOWDOWN_FACTOR=5.0
|
||||
-DSQLITE_ENABLE_RBU
|
||||
--enable-debug
|
||||
--with-debug
|
||||
--enable-all
|
||||
}
|
||||
set build(Stdcall) {
|
||||
@ -193,7 +193,7 @@ namespace eval trd {
|
||||
set build(Debug-Two) {
|
||||
-DSQLITE_DEFAULT_MEMSTATUS=0
|
||||
-DSQLITE_MAX_EXPR_DEPTH=0
|
||||
--enable-debug
|
||||
--with-debug
|
||||
}
|
||||
set build(Fast-One) {
|
||||
-O6
|
||||
@ -564,7 +564,7 @@ proc make_script {cfg srcdir bMsvc} {
|
||||
}
|
||||
--enable-fts5 {
|
||||
lappend opts -DSQLITE_ENABLE_FTS5
|
||||
}
|
||||
}
|
||||
--enable-shared {
|
||||
lappend makeOpts USE_CRT_DLL=1 DYNAMIC_SHELL=1
|
||||
}
|
||||
@ -574,7 +574,7 @@ proc make_script {cfg srcdir bMsvc} {
|
||||
}
|
||||
--enable-all {
|
||||
}
|
||||
--enable-debug {
|
||||
--with-debug {
|
||||
# lappend makeOpts OPTIMIZATIONS=0
|
||||
lappend opts -DSQLITE_DEBUG
|
||||
}
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user