From: stephan Date: Wed, 24 Jun 2026 09:19:01 +0000 (+0000) Subject: Have the npm target forward the omit-api flag to its sub-make. Doc typo fixes. X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=5b9f5ee04e24522c46828350be69e55f69b1d682;p=thirdparty%2Fsqlite.git Have the npm target forward the omit-api flag to its sub-make. Doc typo fixes. FossilOrigin-Name: c65153b28f8a7fcf5eec96032b4f030e6f698ed7d5c1ab479462b4e36ab89c55 --- diff --git a/ext/wasm/GNUmakefile b/ext/wasm/GNUmakefile index 0b32872e0d..b86a4e8cbe 100644 --- a/ext/wasm/GNUmakefile +++ b/ext/wasm/GNUmakefile @@ -209,8 +209,8 @@ b.cp = $(call b.mkdir@); \ cp -f -p $(2) $(3) || exit # D.common = flags to use for all $(bin.c-pp) invocations. These must -# passed before any input file names because c-pp's args are processed -# in their given order. +# be passed before any input file names because c-pp's args are +# processed in their given order. # # Maintenance reminder: we cannot include -@policy=error here because # of the @sqlite3.wasm@ placeholders in JS files, which trigger an @@ -593,7 +593,7 @@ ifeq (0,$(MAKING_CLEAN)) # omit-api="feature names..." disables various featuresw by name. # Recognized names are: kvvfs oo1 opfs opfs-sahpool opfs-wl. The name # OPFS is shorthand for all of the OPFS VFSes. For-nodejs builds - # filter out OPFS from withni the OPFS-using files so OPFS is implied + # filter out OPFS from within the OPFS-using files so OPFS is implied # for those builds. D.omit = ifneq (,$(omit-api)) @@ -1652,7 +1652,7 @@ sqlite3-node.mjs \ npm: $(sqlite3.canonical.c) @echo "$(emo.cleanup) Forcing a clean rebuild to ensure consistent optimization flags." $(MAKE) clean - $(MAKE) -e "emcc_opt=-Oz $(emcc-opt-extra)" $(npm_files) + $(MAKE) -e "emcc_opt=-Oz $(emcc-opt-extra)" "omit-api=$(omit-api)" $(npm_files) rm -f $(npm.bundle.zip); zip -r $(npm.bundle.zip) $(npm_files) unzip -l $(npm.bundle.zip) diff --git a/manifest b/manifest index 452eee73e8..19d535958d 100644 --- a/manifest +++ b/manifest @@ -1,5 +1,5 @@ -C Teach\sthe\sJS\sbuild\sto\sfilter\sout\svarious\sAPIs/VFSes\swhen\spassed\somit-api='api\snames...'.\sFully\strimmed\sthis\ssaves\sjust\sshy\sof\s300kb\sfrom\sthe\sJS.\sMake\sloud=1\smode\sdistinctly\slouder\swhen\spreprocessing. -D 2026-06-24T09:09:02.369 +C Have\sthe\snpm\starget\sforward\sthe\somit-api\sflag\sto\sits\ssub-make.\sDoc\stypo\sfixes. +D 2026-06-24T09:19:01.412 F .fossil-settings/binary-glob 61195414528fb3ea9693577e1980230d78a1f8b0a54c78cf1b9b24d0a409ed6a x F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea @@ -577,7 +577,7 @@ F ext/session/sessionwor.test 6fd9a2256442cebde5b2284936ae9e0d54bde692d0f5fd009e F ext/session/sqlite3session.c ce9f2ce2cc6b17f46854788e47016ba9be1b59ca4037728b6c025397b98edb12 F ext/session/sqlite3session.h ca7c4422c1514a95056cc8d333217df6b1829d39058126b1de85d10cd62d7a9c F ext/session/test_session.c d3275da24b8d362e3c2b393c00d5248f75f1cd474dadf29d8c4683f75cb52e6d -F ext/wasm/GNUmakefile 04971634a5e107963e7dc097255eb621ba6a6a393a6f6953994d9cb0676d68c1 +F ext/wasm/GNUmakefile 7c84775186ed233b22bb425460f1edab2348ac763ade91ea7dedcea28d4b1269 F ext/wasm/README-dist.txt f01081a850ce38a56706af6b481e3a7878e24e42b314cfcd4b129f0f8427066a F ext/wasm/README.md 2e87804e12c98f1d194b7a06162a88441d33bb443efcfe00dc6565a780d2f259 F ext/wasm/SQLTester/GNUmakefile e0794f676d55819951bbfae45cc5e8d7818dc460492dc317ce7f0d2eca15caff @@ -2208,8 +2208,8 @@ F tool/warnings-clang.sh bbf6a1e685e534c92ec2bfba5b1745f34fb6f0bc2a362850723a9ee F tool/warnings.sh a554d13f6e5cf3760f041b87939e3d616ec6961859c3245e8ef701d1eafc2ca2 F tool/win/sqlite.vsix deb315d026cc8400325c5863eef847784a219a2f F tool/winmain.c 00c8fb88e365c9017db14c73d3c78af62194d9644feaf60e220ab0f411f3604c -P f6618a693b7b71f4b846fac257100d3a516dcda687b039d24bcaf29dd1c7454b -R b422235db3953ae7fcd502a39dc5f1c5 +P 2603c855795fc9466522b1e10433efd5e30975e68ee891680f27f06f3189390b +R f4816b03d7d2cbe2a630c4fadfd135a8 U stephan -Z 210f113079ad31e99cab5029ed6f532d +Z 4b095048ba2e3bcbbe3f43f2dadfa0f6 # Remove this line to create a well-formed Fossil manifest. diff --git a/manifest.uuid b/manifest.uuid index 68539356f4..79dd647b6b 100644 --- a/manifest.uuid +++ b/manifest.uuid @@ -1 +1 @@ -2603c855795fc9466522b1e10433efd5e30975e68ee891680f27f06f3189390b +c65153b28f8a7fcf5eec96032b4f030e6f698ed7d5c1ab479462b4e36ab89c55