From: stephan <stephan@noemail.net>
Date: Sat, 28 Jan 2023 09:51:41 +0000 (+0000)
Subject: Makefile doc touchups - no code/build changes.
X-Git-Tag: version-3.41.0~79
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=c7170350d7f7c04ec520c5fdbafeabb9eeae7cd7;p=thirdparty%2Fsqlite.git

Makefile doc touchups - no code/build changes.

FossilOrigin-Name: 3458a481b9ee391122dba531358d664d5219ce4a58cbce93d07df57cc64dc2c7
---

diff --git a/ext/wasm/GNUmakefile b/ext/wasm/GNUmakefile
index 018d7edd53..92173e79f1 100644
--- a/ext/wasm/GNUmakefile
+++ b/ext/wasm/GNUmakefile
@@ -582,14 +582,15 @@ endef
 sqlite3.wasm := $(dir.dout)/sqlite3.wasm
 sqlite3-wasm.c := $(dir.api)/sqlite3-wasm.c
 # sqlite3-wasm.o vs sqlite3-wasm.c: building against the latter
-# (predictably) results in a slightly faster binary, but we're close
+# (predictably) results in a slightly faster binary. We're close
 # enough to the target speed requirements that the 500ms makes a
-# difference. Thus we build all binaries against sqlite3-wasm.c
-# instead of building a shared copy of sqlite3-wasm.o.
+# difference, so we build all binaries against sqlite3-wasm.c instead
+# of building a shared copy of sqlite3-wasm.o to link against.
 ########################################################################
-# SQLITE3.xJS.RECIPE = the $(call)able recipe body for $(sqlite3.js)
-# and $(sqlite3.mjs). $1 = one of (vanilla, esm). $2 must be 1 for
-# ES6-style builds, 0 for other builds.
+# SQLITE3.xJS.EXPORT-DEFAULT is part of SQLITE3-WASMFS.xJS.RECIPE and
+# SETUP_LIB_BUILD_MODE, factored into a separate piece to avoid code
+# duplication. $1 is 1 if the build mode needs this workaround (esm,
+# bundler-friendly) and 0 if not (vanilla).
 #
 # Reminder for ESM builds: even if we use -sEXPORT_ES6=0, emcc _still_
 # adds:
@@ -603,11 +604,6 @@ sqlite3-wasm.c := $(dir.api)/sqlite3-wasm.c
 #
 # Upstream RFE:
 # https://github.com/emscripten-core/emscripten/issues/18237
-########################################################################
-# SQLITE3.xJS.EXPORT-DEFAULT is part of SQLITE3[-WASMFS].xJS.RECIPE,
-# factored into a separate piece to avoid code duplication. $1 is 1 if
-# the build mode needs this workaround (esm, bundler-friendly) and 0
-# if not (vanilla).
 define SQLITE3.xJS.ESM-EXPORT-DEFAULT
 if [ x1 = x$(1) ]; then \
 		echo "Fragile workaround for an Emscripten annoyance. See SQLITE3.xJS.RECIPE."; \
@@ -707,17 +703,16 @@ $(eval $(call SETUP_LIB_BUILD_MODE,bundler-friendly,1,\
 #
 ########################################################################
 ########################################################################
-# We have to ensure that we do not build both $(sqlite3.js) and
-# $(sqlite3.mjs) in parallel because both result in the creation of
-# $(sqlite3.wasm). We have no(?) way to build just the .mjs file
-# without also building the .wasm file. i.e.  we're building
-# $(sqlite3.wasm) multiple times, but that's apparently unavoidable
-# (and harmless, just a waste of build time).
+# We have to ensure that we do not build both $(sqlite3*.*js) in
+# parallel because both result in the creation of $(sqlite3.wasm). We
+# have no way to build just the .mjs file without also building the
+# .wasm file because the generated .mjs file has to include info about
+# the imports needed by the wasm file, so they have to be built
+# together. i.e.  we're building $(sqlite3.wasm) multiple times, but
+# that's unavoidable (and harmless, just a waste of build time).
 $(sqlite3.wasm): $(sqlite3.js)
 $(sqlite3.mjs): $(sqlite3.js)
 $(sqlite3-bundler-friendly.mjs): $(sqlite3.mjs)
-# maintenance reminder: the deps on ^^^ must all be such that they are
-# never built in parallel.
 CLEAN_FILES += $(sqlite3.wasm)
 
 ########################################################################
@@ -755,7 +750,6 @@ emcc.speedtest1 += -sALLOW_MEMORY_GROWTH
 emcc.speedtest1 += -sINITIAL_MEMORY=$(emcc.INITIAL_MEMORY.$(emcc.INITIAL_MEMORY))
 emcc.speedtest1.common += -sINVOKE_RUN=0
 emcc.speedtest1.common += --no-entry
-#emcc.speedtest1.common += -flto
 emcc.speedtest1.common += -sABORTING_MALLOC
 emcc.speedtest1.common += -sSTRICT_JS
 emcc.speedtest1.common += -sMODULARIZE
diff --git a/manifest b/manifest
index 723b0f765d..2da9056d6d 100644
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Overhaul\sext/wasm/GNUmakefile\sto\sconsolidate\swhat\samounts\sto\smuch\scopy/paste/slightly-edit\sduplication\sinto\sa\ssingle\sfunction,\scalled\sonce\sper\sdistinctive\sbuild\smode\s(vanilla,\sESM,\sbundler-friendly).
-D 2023-01-28T09:11:08.421
+C Makefile\sdoc\stouchups\s-\sno\scode/build\schanges.
+D 2023-01-28T09:51:41.063
 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
 F LICENSE.md df5091916dbb40e6e9686186587125e1b2ff51f022cc334e886c19a0e9982724
@@ -466,7 +466,7 @@ F ext/userauth/sqlite3userauth.h 7f3ea8c4686db8e40b0a0e7a8e0b00fac13aa7a3
 F ext/userauth/user-auth.txt e6641021a9210364665fe625d067617d03f27b04
 F ext/userauth/userauth.c 7f00cded7dcaa5d47f54539b290a43d2e59f4b1eb5f447545fa865f002fc80cb
 F ext/wasm/EXPORTED_FUNCTIONS.fiddle.in 27450c8b8c70875a260aca55435ec927068b34cef801a96205adb81bdcefc65c
-F ext/wasm/GNUmakefile a32c527fb162489266c11cfbb3f0d02e9140c3e88ce884cdc1a8a79477b3cf06
+F ext/wasm/GNUmakefile 6fee35e99b82c948a1a4675bb4d1d037800c2171274bd8ab3779fac53aca6d1a
 F ext/wasm/README-dist.txt 4a1db3677d0341a12434d1fd6c97aae2f96785d734641407a201b719f5d94f44
 F ext/wasm/README.md ef39861aa21632fdbca0bdd469f78f0096f6449a720f3f39642594af503030e9
 F ext/wasm/api/EXPORTED_FUNCTIONS.sqlite3-api d6a5078f48a5301ed17b9a30331075d9b2506e1360c1f0dee0c7816c10acd9ab
@@ -2044,8 +2044,8 @@ F vsixtest/vsixtest.tcl 6a9a6ab600c25a91a7acc6293828957a386a8a93
 F vsixtest/vsixtest.vcxproj.data 2ed517e100c66dc455b492e1a33350c1b20fbcdc
 F vsixtest/vsixtest.vcxproj.filters 37e51ffedcdb064aad6ff33b6148725226cd608e
 F vsixtest/vsixtest_TemporaryKey.pfx e5b1b036facdb453873e7084e1cae9102ccc67a0
-P 7b168ee2af09f04b41a6ef4c14ccaddc0c9b0bfe9dc1e6a86d8f5317606bd78d
-R 89098a85baa5f167018e750de6e19924
+P 168e5a93013d8650c180e19788e5f301b5d5ae8501d0ce728004fd750ca9e682
+R 63fed4ef637e391371d6a01d8747792f
 U stephan
-Z 698b42e1629b67c07c9d270103d0775e
+Z ef029a1e60dbc16f9c5e60c686e321d3
 # Remove this line to create a well-formed Fossil manifest.
diff --git a/manifest.uuid b/manifest.uuid
index a7acc799ab..499905f2a1 100644
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-168e5a93013d8650c180e19788e5f301b5d5ae8501d0ce728004fd750ca9e682
\ No newline at end of file
+3458a481b9ee391122dba531358d664d5219ce4a58cbce93d07df57cc64dc2c7
\ No newline at end of file