From: stephan Date: Fri, 22 Nov 2024 14:18:23 +0000 (+0000) Subject: Move handling of the tempstore feature flag into the OPT_FEATURE_FLAGS list and remov... X-Git-Tag: major-relase~118 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=5c945264b0dd500f2d301b2fb82394d20af5bb85;p=thirdparty%2Fsqlite.git Move handling of the tempstore feature flag into the OPT_FEATURE_FLAGS list and remove the CFLAGS.libsqlite3 makefile var which exists solely to account for the tempstore being tracked separately from the other feature flags. FossilOrigin-Name: 2df5065d118ca4abcb4f285d07819e73c5e32f7e470d30eabc7e3d999ec8d0f2 --- diff --git a/Makefile.in b/Makefile.in index 483ca35d94..59963f3ced 100644 --- a/Makefile.in +++ b/Makefile.in @@ -184,11 +184,6 @@ JIMSH = ./jimsh$(TEXE) B.tclsh = @BTCLSH@ $(B.tclsh): -# -# $(CFLAGS.libsqlite3) is documented in main.mk. -# -CFLAGS.libsqlite3 = -DSQLITE_TEMP_STORE=@TEMP_STORE@ - # # $(OPT_FEATURE_FLAGS) is documented in main.mk. # diff --git a/auto.def b/auto.def index 086d8e1e3c..c49e7b949b 100644 --- a/auto.def +++ b/auto.def @@ -866,7 +866,7 @@ apply {{} { } } msg-result $ts - define TEMP_STORE $tsn + sqlite-add-feature-flag -DSQLITE_TEMP_STORE=$tsn }} ######################################################################## diff --git a/main.mk b/main.mk index 9a706d1078..3e1169368a 100644 --- a/main.mk +++ b/main.mk @@ -358,12 +358,6 @@ INSTALL.noexec = $(INSTALL) -m 0644 # T.compile = $(T.cc) $(T.compile.extras) -# -# $(CFLAGS.libsqlite3) must contain any CFLAGS which are relevant for -# compiling the library's own sources, including (sometimes) when -# compiling sqlite3.c directly in to another app. -# -CFLAGS.libsqlite3 ?= # # $(T.cc.sqlite) is $(T.cc) plus any flags which are desired for the # library as a whole, but not necessarily needed for every binary. It @@ -1100,255 +1094,255 @@ sqlite3ext.h: .target_source # DEPS_OBJ_COMMON = $(MAKE_SANITY_CHECK) $(HDR) parse.o: parse.c $(DEPS_OBJ_COMMON) - $(T.cc.sqlite) $(CFLAGS.libsqlite3) -c parse.c + $(T.cc.sqlite) -c parse.c opcodes.o: opcodes.c - $(T.cc.sqlite) $(CFLAGS.libsqlite3) -c opcodes.c + $(T.cc.sqlite) -c opcodes.c # Rules to build individual *.o files from files in the src directory. # alter.o: $(TOP)/src/alter.c $(DEPS_OBJ_COMMON) - $(T.cc.sqlite) $(CFLAGS.libsqlite3) -c $(TOP)/src/alter.c + $(T.cc.sqlite) -c $(TOP)/src/alter.c analyze.o: $(TOP)/src/analyze.c $(DEPS_OBJ_COMMON) - $(T.cc.sqlite) $(CFLAGS.libsqlite3) -c $(TOP)/src/analyze.c + $(T.cc.sqlite) -c $(TOP)/src/analyze.c attach.o: $(TOP)/src/attach.c $(DEPS_OBJ_COMMON) - $(T.cc.sqlite) $(CFLAGS.libsqlite3) -c $(TOP)/src/attach.c + $(T.cc.sqlite) -c $(TOP)/src/attach.c auth.o: $(TOP)/src/auth.c $(DEPS_OBJ_COMMON) - $(T.cc.sqlite) $(CFLAGS.libsqlite3) -c $(TOP)/src/auth.c + $(T.cc.sqlite) -c $(TOP)/src/auth.c backup.o: $(TOP)/src/backup.c $(DEPS_OBJ_COMMON) - $(T.cc.sqlite) $(CFLAGS.libsqlite3) -c $(TOP)/src/backup.c + $(T.cc.sqlite) -c $(TOP)/src/backup.c bitvec.o: $(TOP)/src/bitvec.c $(DEPS_OBJ_COMMON) - $(T.cc.sqlite) $(CFLAGS.libsqlite3) -c $(TOP)/src/bitvec.c + $(T.cc.sqlite) -c $(TOP)/src/bitvec.c btmutex.o: $(TOP)/src/btmutex.c $(DEPS_OBJ_COMMON) - $(T.cc.sqlite) $(CFLAGS.libsqlite3) -c $(TOP)/src/btmutex.c + $(T.cc.sqlite) -c $(TOP)/src/btmutex.c btree.o: $(TOP)/src/btree.c $(DEPS_OBJ_COMMON) $(TOP)/src/pager.h - $(T.cc.sqlite) $(CFLAGS.libsqlite3) -c $(TOP)/src/btree.c + $(T.cc.sqlite) -c $(TOP)/src/btree.c build.o: $(TOP)/src/build.c $(DEPS_OBJ_COMMON) - $(T.cc.sqlite) $(CFLAGS.libsqlite3) -c $(TOP)/src/build.c + $(T.cc.sqlite) -c $(TOP)/src/build.c callback.o: $(TOP)/src/callback.c $(DEPS_OBJ_COMMON) - $(T.cc.sqlite) $(CFLAGS.libsqlite3) -c $(TOP)/src/callback.c + $(T.cc.sqlite) -c $(TOP)/src/callback.c complete.o: $(TOP)/src/complete.c $(DEPS_OBJ_COMMON) - $(T.cc.sqlite) $(CFLAGS.libsqlite3) -c $(TOP)/src/complete.c + $(T.cc.sqlite) -c $(TOP)/src/complete.c ctime.o: $(TOP)/src/ctime.c $(DEPS_OBJ_COMMON) - $(T.cc.sqlite) $(CFLAGS.libsqlite3) -c $(TOP)/src/ctime.c + $(T.cc.sqlite) -c $(TOP)/src/ctime.c date.o: $(TOP)/src/date.c $(DEPS_OBJ_COMMON) - $(T.cc.sqlite) $(CFLAGS.libsqlite3) -c $(TOP)/src/date.c + $(T.cc.sqlite) -c $(TOP)/src/date.c dbpage.o: $(TOP)/src/dbpage.c $(DEPS_OBJ_COMMON) - $(T.cc.sqlite) $(CFLAGS.libsqlite3) -c $(TOP)/src/dbpage.c + $(T.cc.sqlite) -c $(TOP)/src/dbpage.c dbstat.o: $(TOP)/src/dbstat.c $(DEPS_OBJ_COMMON) - $(T.cc.sqlite) $(CFLAGS.libsqlite3) -c $(TOP)/src/dbstat.c + $(T.cc.sqlite) -c $(TOP)/src/dbstat.c delete.o: $(TOP)/src/delete.c $(DEPS_OBJ_COMMON) - $(T.cc.sqlite) $(CFLAGS.libsqlite3) -c $(TOP)/src/delete.c + $(T.cc.sqlite) -c $(TOP)/src/delete.c expr.o: $(TOP)/src/expr.c $(DEPS_OBJ_COMMON) - $(T.cc.sqlite) $(CFLAGS.libsqlite3) -c $(TOP)/src/expr.c + $(T.cc.sqlite) -c $(TOP)/src/expr.c fault.o: $(TOP)/src/fault.c $(DEPS_OBJ_COMMON) - $(T.cc.sqlite) $(CFLAGS.libsqlite3) -c $(TOP)/src/fault.c + $(T.cc.sqlite) -c $(TOP)/src/fault.c fkey.o: $(TOP)/src/fkey.c $(DEPS_OBJ_COMMON) - $(T.cc.sqlite) $(CFLAGS.libsqlite3) -c $(TOP)/src/fkey.c + $(T.cc.sqlite) -c $(TOP)/src/fkey.c func.o: $(TOP)/src/func.c $(DEPS_OBJ_COMMON) - $(T.cc.sqlite) $(CFLAGS.libsqlite3) -c $(TOP)/src/func.c + $(T.cc.sqlite) -c $(TOP)/src/func.c global.o: $(TOP)/src/global.c $(DEPS_OBJ_COMMON) - $(T.cc.sqlite) $(CFLAGS.libsqlite3) -c $(TOP)/src/global.c + $(T.cc.sqlite) -c $(TOP)/src/global.c hash.o: $(TOP)/src/hash.c $(DEPS_OBJ_COMMON) - $(T.cc.sqlite) $(CFLAGS.libsqlite3) -c $(TOP)/src/hash.c + $(T.cc.sqlite) -c $(TOP)/src/hash.c insert.o: $(TOP)/src/insert.c $(DEPS_OBJ_COMMON) - $(T.cc.sqlite) $(CFLAGS.libsqlite3) -c $(TOP)/src/insert.c + $(T.cc.sqlite) -c $(TOP)/src/insert.c json.o: $(TOP)/src/json.c $(DEPS_OBJ_COMMON) - $(T.cc.sqlite) $(CFLAGS.libsqlite3) -c $(TOP)/src/json.c + $(T.cc.sqlite) -c $(TOP)/src/json.c legacy.o: $(TOP)/src/legacy.c $(DEPS_OBJ_COMMON) - $(T.cc.sqlite) $(CFLAGS.libsqlite3) -c $(TOP)/src/legacy.c + $(T.cc.sqlite) -c $(TOP)/src/legacy.c loadext.o: $(TOP)/src/loadext.c $(DEPS_OBJ_COMMON) - $(T.cc.sqlite) $(CFLAGS.libsqlite3) -c $(TOP)/src/loadext.c + $(T.cc.sqlite) -c $(TOP)/src/loadext.c main.o: $(TOP)/src/main.c $(DEPS_OBJ_COMMON) - $(T.cc.sqlite) $(CFLAGS.libsqlite3) -c $(TOP)/src/main.c + $(T.cc.sqlite) -c $(TOP)/src/main.c malloc.o: $(TOP)/src/malloc.c $(DEPS_OBJ_COMMON) - $(T.cc.sqlite) $(CFLAGS.libsqlite3) -c $(TOP)/src/malloc.c + $(T.cc.sqlite) -c $(TOP)/src/malloc.c mem0.o: $(TOP)/src/mem0.c $(DEPS_OBJ_COMMON) - $(T.cc.sqlite) $(CFLAGS.libsqlite3) -c $(TOP)/src/mem0.c + $(T.cc.sqlite) -c $(TOP)/src/mem0.c mem1.o: $(TOP)/src/mem1.c $(DEPS_OBJ_COMMON) - $(T.cc.sqlite) $(CFLAGS.libsqlite3) -c $(TOP)/src/mem1.c + $(T.cc.sqlite) -c $(TOP)/src/mem1.c mem2.o: $(TOP)/src/mem2.c $(DEPS_OBJ_COMMON) - $(T.cc.sqlite) $(CFLAGS.libsqlite3) -c $(TOP)/src/mem2.c + $(T.cc.sqlite) -c $(TOP)/src/mem2.c mem3.o: $(TOP)/src/mem3.c $(DEPS_OBJ_COMMON) - $(T.cc.sqlite) $(CFLAGS.libsqlite3) -c $(TOP)/src/mem3.c + $(T.cc.sqlite) -c $(TOP)/src/mem3.c mem5.o: $(TOP)/src/mem5.c $(DEPS_OBJ_COMMON) - $(T.cc.sqlite) $(CFLAGS.libsqlite3) -c $(TOP)/src/mem5.c + $(T.cc.sqlite) -c $(TOP)/src/mem5.c memdb.o: $(TOP)/src/memdb.c $(DEPS_OBJ_COMMON) - $(T.cc.sqlite) $(CFLAGS.libsqlite3) -c $(TOP)/src/memdb.c + $(T.cc.sqlite) -c $(TOP)/src/memdb.c memjournal.o: $(TOP)/src/memjournal.c $(DEPS_OBJ_COMMON) - $(T.cc.sqlite) $(CFLAGS.libsqlite3) -c $(TOP)/src/memjournal.c + $(T.cc.sqlite) -c $(TOP)/src/memjournal.c mutex.o: $(TOP)/src/mutex.c $(DEPS_OBJ_COMMON) - $(T.cc.sqlite) $(CFLAGS.libsqlite3) -c $(TOP)/src/mutex.c + $(T.cc.sqlite) -c $(TOP)/src/mutex.c mutex_noop.o: $(TOP)/src/mutex_noop.c $(DEPS_OBJ_COMMON) - $(T.cc.sqlite) $(CFLAGS.libsqlite3) -c $(TOP)/src/mutex_noop.c + $(T.cc.sqlite) -c $(TOP)/src/mutex_noop.c mutex_unix.o: $(TOP)/src/mutex_unix.c $(DEPS_OBJ_COMMON) - $(T.cc.sqlite) $(CFLAGS.libsqlite3) -c $(TOP)/src/mutex_unix.c + $(T.cc.sqlite) -c $(TOP)/src/mutex_unix.c mutex_w32.o: $(TOP)/src/mutex_w32.c $(DEPS_OBJ_COMMON) - $(T.cc.sqlite) $(CFLAGS.libsqlite3) -c $(TOP)/src/mutex_w32.c + $(T.cc.sqlite) -c $(TOP)/src/mutex_w32.c notify.o: $(TOP)/src/notify.c $(DEPS_OBJ_COMMON) - $(T.cc.sqlite) $(CFLAGS.libsqlite3) -c $(TOP)/src/notify.c + $(T.cc.sqlite) -c $(TOP)/src/notify.c pager.o: $(TOP)/src/pager.c $(DEPS_OBJ_COMMON) $(TOP)/src/pager.h - $(T.cc.sqlite) $(CFLAGS.libsqlite3) -c $(TOP)/src/pager.c + $(T.cc.sqlite) -c $(TOP)/src/pager.c pcache.o: $(TOP)/src/pcache.c $(DEPS_OBJ_COMMON) $(TOP)/src/pcache.h - $(T.cc.sqlite) $(CFLAGS.libsqlite3) -c $(TOP)/src/pcache.c + $(T.cc.sqlite) -c $(TOP)/src/pcache.c pcache1.o: $(TOP)/src/pcache1.c $(DEPS_OBJ_COMMON) $(TOP)/src/pcache.h - $(T.cc.sqlite) $(CFLAGS.libsqlite3) -c $(TOP)/src/pcache1.c + $(T.cc.sqlite) -c $(TOP)/src/pcache1.c os.o: $(TOP)/src/os.c $(DEPS_OBJ_COMMON) - $(T.cc.sqlite) $(CFLAGS.libsqlite3) -c $(TOP)/src/os.c + $(T.cc.sqlite) -c $(TOP)/src/os.c os_kv.o: $(TOP)/src/os_kv.c $(DEPS_OBJ_COMMON) - $(T.cc.sqlite) $(CFLAGS.libsqlite3) -c $(TOP)/src/os_kv.c + $(T.cc.sqlite) -c $(TOP)/src/os_kv.c os_unix.o: $(TOP)/src/os_unix.c $(DEPS_OBJ_COMMON) - $(T.cc.sqlite) $(CFLAGS.libsqlite3) -c $(TOP)/src/os_unix.c + $(T.cc.sqlite) -c $(TOP)/src/os_unix.c os_win.o: $(TOP)/src/os_win.c $(DEPS_OBJ_COMMON) - $(T.cc.sqlite) $(CFLAGS.libsqlite3) -c $(TOP)/src/os_win.c + $(T.cc.sqlite) -c $(TOP)/src/os_win.c pragma.o: $(TOP)/src/pragma.c $(DEPS_OBJ_COMMON) - $(T.cc.sqlite) $(CFLAGS.libsqlite3) -c $(TOP)/src/pragma.c + $(T.cc.sqlite) -c $(TOP)/src/pragma.c prepare.o: $(TOP)/src/prepare.c $(DEPS_OBJ_COMMON) - $(T.cc.sqlite) $(CFLAGS.libsqlite3) -c $(TOP)/src/prepare.c + $(T.cc.sqlite) -c $(TOP)/src/prepare.c printf.o: $(TOP)/src/printf.c $(DEPS_OBJ_COMMON) - $(T.cc.sqlite) $(CFLAGS.libsqlite3) -c $(TOP)/src/printf.c + $(T.cc.sqlite) -c $(TOP)/src/printf.c random.o: $(TOP)/src/random.c $(DEPS_OBJ_COMMON) - $(T.cc.sqlite) $(CFLAGS.libsqlite3) -c $(TOP)/src/random.c + $(T.cc.sqlite) -c $(TOP)/src/random.c resolve.o: $(TOP)/src/resolve.c $(DEPS_OBJ_COMMON) - $(T.cc.sqlite) $(CFLAGS.libsqlite3) -c $(TOP)/src/resolve.c + $(T.cc.sqlite) -c $(TOP)/src/resolve.c rowset.o: $(TOP)/src/rowset.c $(DEPS_OBJ_COMMON) - $(T.cc.sqlite) $(CFLAGS.libsqlite3) -c $(TOP)/src/rowset.c + $(T.cc.sqlite) -c $(TOP)/src/rowset.c select.o: $(TOP)/src/select.c $(DEPS_OBJ_COMMON) - $(T.cc.sqlite) $(CFLAGS.libsqlite3) -c $(TOP)/src/select.c + $(T.cc.sqlite) -c $(TOP)/src/select.c status.o: $(TOP)/src/status.c $(DEPS_OBJ_COMMON) - $(T.cc.sqlite) $(CFLAGS.libsqlite3) -c $(TOP)/src/status.c + $(T.cc.sqlite) -c $(TOP)/src/status.c sqlite3.o: sqlite3.h sqlite3.c - $(T.cc.sqlite) $(CFLAGS.libsqlite3) -c sqlite3.c + $(T.cc.sqlite) -c sqlite3.c table.o: $(TOP)/src/table.c $(DEPS_OBJ_COMMON) - $(T.cc.sqlite) $(CFLAGS.libsqlite3) -c $(TOP)/src/table.c + $(T.cc.sqlite) -c $(TOP)/src/table.c threads.o: $(TOP)/src/threads.c $(DEPS_OBJ_COMMON) - $(T.cc.sqlite) $(CFLAGS.libsqlite3) -c $(TOP)/src/threads.c + $(T.cc.sqlite) -c $(TOP)/src/threads.c tokenize.o: $(TOP)/src/tokenize.c keywordhash.h $(DEPS_OBJ_COMMON) - $(T.cc.sqlite) $(CFLAGS.libsqlite3) -c $(TOP)/src/tokenize.c + $(T.cc.sqlite) -c $(TOP)/src/tokenize.c treeview.o: $(TOP)/src/treeview.c $(DEPS_OBJ_COMMON) - $(T.cc.sqlite) $(CFLAGS.libsqlite3) -c $(TOP)/src/treeview.c + $(T.cc.sqlite) -c $(TOP)/src/treeview.c trigger.o: $(TOP)/src/trigger.c $(DEPS_OBJ_COMMON) - $(T.cc.sqlite) $(CFLAGS.libsqlite3) -c $(TOP)/src/trigger.c + $(T.cc.sqlite) -c $(TOP)/src/trigger.c update.o: $(TOP)/src/update.c $(DEPS_OBJ_COMMON) - $(T.cc.sqlite) $(CFLAGS.libsqlite3) -c $(TOP)/src/update.c + $(T.cc.sqlite) -c $(TOP)/src/update.c upsert.o: $(TOP)/src/upsert.c $(DEPS_OBJ_COMMON) - $(T.cc.sqlite) $(CFLAGS.libsqlite3) -c $(TOP)/src/upsert.c + $(T.cc.sqlite) -c $(TOP)/src/upsert.c utf.o: $(TOP)/src/utf.c $(DEPS_OBJ_COMMON) - $(T.cc.sqlite) $(CFLAGS.libsqlite3) -c $(TOP)/src/utf.c + $(T.cc.sqlite) -c $(TOP)/src/utf.c util.o: $(TOP)/src/util.c $(DEPS_OBJ_COMMON) - $(T.cc.sqlite) $(CFLAGS.libsqlite3) -c $(TOP)/src/util.c + $(T.cc.sqlite) -c $(TOP)/src/util.c vacuum.o: $(TOP)/src/vacuum.c $(DEPS_OBJ_COMMON) - $(T.cc.sqlite) $(CFLAGS.libsqlite3) -c $(TOP)/src/vacuum.c + $(T.cc.sqlite) -c $(TOP)/src/vacuum.c vdbe.o: $(TOP)/src/vdbe.c $(DEPS_OBJ_COMMON) - $(T.cc.sqlite) $(CFLAGS.libsqlite3) -c $(TOP)/src/vdbe.c + $(T.cc.sqlite) -c $(TOP)/src/vdbe.c vdbeapi.o: $(TOP)/src/vdbeapi.c $(DEPS_OBJ_COMMON) - $(T.cc.sqlite) $(CFLAGS.libsqlite3) -c $(TOP)/src/vdbeapi.c + $(T.cc.sqlite) -c $(TOP)/src/vdbeapi.c vdbeaux.o: $(TOP)/src/vdbeaux.c $(DEPS_OBJ_COMMON) - $(T.cc.sqlite) $(CFLAGS.libsqlite3) -c $(TOP)/src/vdbeaux.c + $(T.cc.sqlite) -c $(TOP)/src/vdbeaux.c vdbeblob.o: $(TOP)/src/vdbeblob.c $(DEPS_OBJ_COMMON) - $(T.cc.sqlite) $(CFLAGS.libsqlite3) -c $(TOP)/src/vdbeblob.c + $(T.cc.sqlite) -c $(TOP)/src/vdbeblob.c vdbemem.o: $(TOP)/src/vdbemem.c $(DEPS_OBJ_COMMON) - $(T.cc.sqlite) $(CFLAGS.libsqlite3) -c $(TOP)/src/vdbemem.c + $(T.cc.sqlite) -c $(TOP)/src/vdbemem.c vdbesort.o: $(TOP)/src/vdbesort.c $(DEPS_OBJ_COMMON) - $(T.cc.sqlite) $(CFLAGS.libsqlite3) -c $(TOP)/src/vdbesort.c + $(T.cc.sqlite) -c $(TOP)/src/vdbesort.c vdbetrace.o: $(TOP)/src/vdbetrace.c $(DEPS_OBJ_COMMON) - $(T.cc.sqlite) $(CFLAGS.libsqlite3) -c $(TOP)/src/vdbetrace.c + $(T.cc.sqlite) -c $(TOP)/src/vdbetrace.c vdbevtab.o: $(TOP)/src/vdbevtab.c $(DEPS_OBJ_COMMON) - $(T.cc.sqlite) $(CFLAGS.libsqlite3) -c $(TOP)/src/vdbevtab.c + $(T.cc.sqlite) -c $(TOP)/src/vdbevtab.c vtab.o: $(TOP)/src/vtab.c $(DEPS_OBJ_COMMON) - $(T.cc.sqlite) $(CFLAGS.libsqlite3) -c $(TOP)/src/vtab.c + $(T.cc.sqlite) -c $(TOP)/src/vtab.c wal.o: $(TOP)/src/wal.c $(DEPS_OBJ_COMMON) - $(T.cc.sqlite) $(CFLAGS.libsqlite3) -c $(TOP)/src/wal.c + $(T.cc.sqlite) -c $(TOP)/src/wal.c walker.o: $(TOP)/src/walker.c $(DEPS_OBJ_COMMON) - $(T.cc.sqlite) $(CFLAGS.libsqlite3) -c $(TOP)/src/walker.c + $(T.cc.sqlite) -c $(TOP)/src/walker.c where.o: $(TOP)/src/where.c $(DEPS_OBJ_COMMON) - $(T.cc.sqlite) $(CFLAGS.libsqlite3) -c $(TOP)/src/where.c + $(T.cc.sqlite) -c $(TOP)/src/where.c wherecode.o: $(TOP)/src/wherecode.c $(DEPS_OBJ_COMMON) - $(T.cc.sqlite) $(CFLAGS.libsqlite3) -c $(TOP)/src/wherecode.c + $(T.cc.sqlite) -c $(TOP)/src/wherecode.c whereexpr.o: $(TOP)/src/whereexpr.c $(DEPS_OBJ_COMMON) - $(T.cc.sqlite) $(CFLAGS.libsqlite3) -c $(TOP)/src/whereexpr.c + $(T.cc.sqlite) -c $(TOP)/src/whereexpr.c window.o: $(TOP)/src/window.c $(DEPS_OBJ_COMMON) - $(T.cc.sqlite) $(CFLAGS.libsqlite3) -c $(TOP)/src/window.c + $(T.cc.sqlite) -c $(TOP)/src/window.c tclsqlite.o: $(T.tcl.env.sh) $(TOP)/src/tclsqlite.c $(DEPS_OBJ_COMMON) $(T.compile.tcl) -DUSE_TCL_STUBS=1 $$TCL_INCLUDE_SPEC \ @@ -1648,7 +1642,7 @@ testfixture$(T.exe): $(T.tcl.env.sh) has_tclsh85 $(TESTFIXTURE_SRC) $(T.link.tcl) -DSQLITE_NO_SYNC=1 $(TESTFIXTURE_FLAGS) \ -o $@ $(TESTFIXTURE_SRC) \ $$TCL_LIB_SPEC $$TCL_INCLUDE_SPEC \ - $(CFLAGS.libsqlite3) $(LDFLAGS.libsqlite3) + $(LDFLAGS.libsqlite3) coretestprogs: testfixture$(B.exe) sqlite3$(B.exe) @@ -1795,7 +1789,7 @@ sqltclsh.c: sqlite3.c $(TOP)/src/tclsqlite.c $(TOP)/tool/sqltclsh.tcl \ $(B.tclsh) $(TOP)/tool/mkccode.tcl $(TOP)/tool/sqltclsh.c.in >sqltclsh.c sqltclsh$(T.exe): $(T.tcl.env.sh) sqltclsh.c - $(T.link.tcl) sqltclsh.c -o $@ $$TCL_INCLUDE_SPEC $(CFLAGS.libsqlite3) \ + $(T.link.tcl) sqltclsh.c -o $@ $$TCL_INCLUDE_SPEC \ $(LDFLAGS.libsqlite3) $$TCL_LIB_SPEC $$TCL_LIBS # xbin: target for generic binaries which aren't usually built. It is # used primarily for testing the build process. @@ -1822,7 +1816,7 @@ sqlite3_checker.c: $(CHECKER_DEPS) sqlite3_checker$(T.exe): $(T.tcl.env.sh) sqlite3_checker.c $(T.link.tcl) sqlite3_checker.c -o $@ $$TCL_INCLUDE_SPEC \ - $(CFLAGS.libsqlite3) $$TCL_LIB_SPEC $(LDFLAGS.libsqlite3) + $$TCL_LIB_SPEC $(LDFLAGS.libsqlite3) xbin: sqlite3_checker$(T.exe) dbdump$(T.exe): $(TOP)/ext/misc/dbdump.c sqlite3.o diff --git a/manifest b/manifest index a2a0993d19..83f3b6f2c0 100644 --- a/manifest +++ b/manifest @@ -1,9 +1,9 @@ -C Makefile\sdoc\scleanups.\sNo\sfunctional\schanges. -D 2024-11-22T14:12:18.841 +C Move\shandling\sof\sthe\stempstore\sfeature\sflag\sinto\sthe\sOPT_FEATURE_FLAGS\slist\sand\sremove\sthe\sCFLAGS.libsqlite3\smakefile\svar\swhich\sexists\ssolely\sto\saccount\sfor\sthe\stempstore\sbeing\stracked\sseparately\sfrom\sthe\sother\sfeature\sflags. +D 2024-11-22T14:18:23.840 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea F LICENSE.md e108e1e69ae8e8a59e93c455654b8ac9356a11720d3345df2a4743e9590fb20d -F Makefile.in d0ad8cdcb5a0492eee78b7ae74ace1213294649a547ba90d15e9c39cc08fdbb4 +F Makefile.in 85f2c740cadf969abbd9a6210b8b76636dbf231b9d3efe977b060c3055fac5b9 F Makefile.linux-generic bd3e3cacd369821a6241d4ea1967395c962dfe3057e38cb0a435cee0e8b789d0 F Makefile.msc a92237976eb92c5efaa0dd2524746aec12c196e12df8d4dbff9543a4648c3312 F README.md c3c0f19532ce28f6297a71870f3c7b424729f0e6d9ab889616d3587dd2332159 @@ -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 7cc8f9f228a234db7955ce9061bef85b74162cd890afaaf6338ebc49fa04b2de +F auto.def 1674fbca9580feb23fe4ecc710e39b0fbfadf6190231490424ac2b2bbde5de67 F autoconf/INSTALL 83e4a25da9fd053c7b3665eaaaf7919707915903 F autoconf/Makefile.am adedc1324b6a87fdd1265ddd336d2fb7d4f36a0e77b86ea553ae7cc4ea239347 F autoconf/Makefile.fallback 22fe523eb36dfce31e0f6349f782eb084e86a5620b2b0b4f84a2d6133f53f5ac @@ -696,7 +696,7 @@ F ext/wasm/tests/opfs/concurrency/test.js d08889a5bb6e61937d0b8cbb78c9efbefbf65a F ext/wasm/tests/opfs/concurrency/worker.js 0a8c1a3e6ebb38aabbee24f122693f1fb29d599948915c76906681bb7da1d3d2 F ext/wasm/wasmfs.make bc8bb227f35d5bd3863a7bd2233437c37472a0d81585979f058f9b9b503bef35 F magic.txt 5ade0bc977aa135e79e3faaea894d5671b26107cc91e70783aa7dc83f22f3ba0 -F main.mk b19ce37b58d9378b89e868d9ef9546c0068e5e6b49b02e44e600b752519e888f +F main.mk 01e9b77600f8551df7f970075c09ad9e1898bf2adf512cb861d24b30fb1e6f52 F mptest/config01.test 3c6adcbc50b991866855f1977ff172eb6d901271 F mptest/config02.test 4415dfe36c48785f751e16e32c20b077c28ae504 F mptest/crash01.test 61e61469e257df0850df4293d7d4d6c2af301421 @@ -2199,8 +2199,8 @@ F tool/version-info.c 3b36468a90faf1bbd59c65fd0eb66522d9f941eedd364fabccd7227350 F tool/warnings-clang.sh bbf6a1e685e534c92ec2bfba5b1745f34fb6f0bc2a362850723a9ee87c1b31a7 F tool/warnings.sh 49a486c5069de041aedcbde4de178293e0463ae9918ecad7539eedf0ec77a139 F tool/win/sqlite.vsix deb315d026cc8400325c5863eef847784a219a2f -P 91bd9813e04e34e088d5e73bfe2a4f338513363d9a99095a232b811c6b616354 -R 0e0e7948374fb4ea8d89262652e0cc24 +P 64add0ac706101c53e2d2877fdc0d1ccd071814cae969768d2741cee05f23c01 +R 9816c1b559fff5885cdaa7805e52b14e U stephan -Z c67cb4da7f21bbdaef588069bb0cb4d5 +Z 4bea40264480222fb7de358654df9b7c # Remove this line to create a well-formed Fossil manifest. diff --git a/manifest.uuid b/manifest.uuid index da30cd0938..a332296066 100644 --- a/manifest.uuid +++ b/manifest.uuid @@ -1 +1 @@ -64add0ac706101c53e2d2877fdc0d1ccd071814cae969768d2741cee05f23c01 +2df5065d118ca4abcb4f285d07819e73c5e32f7e470d30eabc7e3d999ec8d0f2