From d2ac1c5b7c0d3d41624b9c3aa71db6246ec26f46 Mon Sep 17 00:00:00 2001 From: stephan Date: Tue, 5 Nov 2024 13:03:58 +0000 Subject: [PATCH] Remove the --enable-rbu flag from the configure script, per /chat discussion, because it's a highly niche feature not in active use. FossilOrigin-Name: 77db0cd736746873d4ed3dbf0e9a43a3e15ab49961fccee20417e01f88de8664 --- auto.def | 2 -- main.mk | 5 ++++- manifest | 16 ++++++++-------- manifest.uuid | 2 +- 4 files changed, 13 insertions(+), 12 deletions(-) diff --git a/auto.def b/auto.def index 5f751c77f8..7f1c9d6a86 100644 --- a/auto.def +++ b/auto.def @@ -144,7 +144,6 @@ set flags { geopoly => {Enable the GEOPOLY extension} rtree => {Enable the RTREE extension} session => {Enable the SESSION extension} - rbu => {Enable the RBU extension} all => {Enable FTS4, FTS5, Geopoly, RTree, Sessions} # # @@ -1118,7 +1117,6 @@ foreach {boolFlag featureFlag ifSetEvalThis} { fts5 -DSQLITE_ENABLE_FTS5 {affirm-have-math fts5} geopoly -DSQLITE_ENABLE_GEOPOLY {proj-opt-set rtree} rtree -DSQLITE_ENABLE_RTREE {} - rbu -DSQLITE_ENABLE_RBU {} session {-DSQLITE_ENABLE_SESSION -DSQLITE_ENABLE_PREUPDATE_HOOK} {} update-limit -DSQLITE_ENABLE_UPDATE_DELETE_LIMIT {} memsys5 -DSQLITE_ENABLE_MEMSYS5 {} diff --git a/main.mk b/main.mk index a0fc7de672..bcb642398e 100644 --- a/main.mk +++ b/main.mk @@ -1796,9 +1796,12 @@ kvtest$(T.exe): $(TOP)/test/kvtest.c sqlite3.c $(T.link) $(KV_OPT) -o $@ $(TOP)/test/kvtest.c sqlite3.c $(LDFLAGS.libsqlite3) xbin: kvtest$(T.exe) +# +# rbu$(T.exe) requires building with -DSQLITE_ENABLE_RBU, which +# specifically does not have an --enable-rbu flag in the configure +# script. rbu$(T.exe): $(TOP)/ext/rbu/rbu.c $(TOP)/ext/rbu/sqlite3rbu.c sqlite3.o $(T.link) -I. -o $@ $(TOP)/ext/rbu/rbu.c sqlite3.o $(LDFLAGS.libsqlite3) -xbin: rbu$(T.exe) loadfts$(T.exe): $(TOP)/tool/loadfts.c $(libsqlite3.LIB) $(T.link) $(TOP)/tool/loadfts.c $(libsqlite3.LIB) -o $@ $(LDFLAGS.libsqlite3) diff --git a/manifest b/manifest index 8d6a1004aa..fb9f6e0d34 100644 --- a/manifest +++ b/manifest @@ -1,5 +1,5 @@ -C Ensure\sthat\sthe\sone-line\srunning\sstatus\soutput\sfrom\stestrunner.tcl\sdoes\snot\nexceed\sthe\s80-char\sline\swidth\sof\sa\sstandard\sterminal. -D 2024-11-05T11:59:45.661 +C Remove\sthe\s--enable-rbu\sflag\sfrom\sthe\sconfigure\sscript,\sper\s/chat\sdiscussion,\sbecause\sit's\sa\shighly\sniche\sfeature\snot\sin\sactive\suse. +D 2024-11-05T13:03:58.554 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea F LICENSE.md c5b4009dca54d127d2d6033c22fd9cc34f53bedb6ef12c7cbaa468381c74ab28 @@ -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 ac7dfc51216c6aa7d34e82d73c945cb71758a3fb79612ef2c5ed38f468d980e8 +F auto.def 348be257a61090f739287d54046f63801c99705f42fae0dffa2ba415dd9afcfb F autoconf/INSTALL 83e4a25da9fd053c7b3665eaaaf7919707915903 F autoconf/Makefile.am adedc1324b6a87fdd1265ddd336d2fb7d4f36a0e77b86ea553ae7cc4ea239347 F autoconf/Makefile.fallback 22fe523eb36dfce31e0f6349f782eb084e86a5620b2b0b4f84a2d6133f53f5ac @@ -698,7 +698,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 342578d173fd10ab1128d29b0fb61722b8ac08d73e1dd2cf66ea1f27c3bea0f2 +F main.mk ef087df40894cf2c024ec5f4d763853616c9616b073fb86b71146f11fa003af3 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 ee9eb8b157c93b33a8ac201c31169cdd1d2cf2f21da92f7a6a418a41e5a50b7b -R 42fdf6d683cf4cf4bef385bd5a8dd761 -U drh -Z 5ea36a74eb3b5e1b4fcf77e0c8195535 +P 1eae0f9ed3c4530d117a8efc4adaf0b2cc422083f0407830a1a6d2a5b970fa1a +R 5832e2fda8be65dd3be8138925e4ff6f +U stephan +Z 66fc4d6192e82f3b20a33931887419b0 # Remove this line to create a well-formed Fossil manifest. diff --git a/manifest.uuid b/manifest.uuid index 83fd9d0272..36c6766e69 100644 --- a/manifest.uuid +++ b/manifest.uuid @@ -1 +1 @@ -1eae0f9ed3c4530d117a8efc4adaf0b2cc422083f0407830a1a6d2a5b970fa1a +77db0cd736746873d4ed3dbf0e9a43a3e15ab49961fccee20417e01f88de8664