From: stephan <stephan@noemail.net>
Date: Fri, 23 Dec 2022 18:38:14 +0000 (+0000)
Subject: Explicitly omit threading and extension loading from the ext/wasm/c-pp binary build... 
X-Git-Tag: version-3.41.0~199
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=ace682e149ea98304fce7babeea3c0cbd496f403;p=thirdparty%2Fsqlite.git

Explicitly omit threading and extension loading from the ext/wasm/c-pp binary build to avoid a link error on some systems.

FossilOrigin-Name: 5d9a14715c25efcd81cadafabf03aad7213251bd1b3dc181939c2dba8d942fb6
---

diff --git a/ext/wasm/GNUmakefile b/ext/wasm/GNUmakefile
index db18b283e6..92e552c766 100644
--- a/ext/wasm/GNUmakefile
+++ b/ext/wasm/GNUmakefile
@@ -213,7 +213,10 @@ DISTCLEAN_FILES += $(bin.stripccomments)
 # https://fossil.wanderinghorse.net/r/c-pp
 bin.c-pp := ./c-pp
 $(bin.c-pp): c-pp.c $(sqlite3.c) $(MAKEFILE)
-	$(CC) -O0 -o $@ c-pp.c $(sqlite3.c) '-DCMPP_DEFAULT_DELIM="//#"' -I$(dir.top)
+	$(CC) -O0 -o $@ c-pp.c $(sqlite3.c) '-DCMPP_DEFAULT_DELIM="//#"' -I$(dir.top) \
+		-DSQLITE_OMIT_LOAD_EXTENSION -DSQLITE_OMIT_DEPRECATED -DSQLITE_OMIT_UTF16 \
+		-DSQLITE_OMIT_SHARED_CACHE -DSQLITE_OMIT_WAL -DSQLITE_THREADSAFE=0 \
+		-DSQLITE_TEMP_STORE=3
 define C-PP.FILTER
 # Create $2 from $1 using $(bin.c-pp)
 # $1 = Input file: c-pp -f $(1).js
diff --git a/manifest b/manifest
index d89ca1ddac..2e6714e1d2 100644
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Add\sSQLITE_ENABLE_MATH_FUNCTIONS\sto\sthe\slist\sof\sfeature\sflags\sin\ssqlite3-wasm.c.
-D 2022-12-23T18:25:48.377
+C Explicitly\somit\sthreading\sand\sextension\sloading\sfrom\sthe\sext/wasm/c-pp\sbinary\sbuild\sto\savoid\sa\slink\serror\son\ssome\ssystems.
+D 2022-12-23T18:38:14.809
 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
 F LICENSE.md df5091916dbb40e6e9686186587125e1b2ff51f022cc334e886c19a0e9982724
@@ -491,7 +491,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 06d385b51bfb206cf779cf1bb816862f77df97fff97a6df9baf05b98c027067a
+F ext/wasm/GNUmakefile ffe0e9818a3b6b36c85a1d10dab76b220a8f5cd83439c62e50223a7970b3d68a
 F ext/wasm/README-dist.txt 2d670b426fc7c613b90a7d2f2b05b433088fe65181abead970980f0a4a75ea20
 F ext/wasm/README.md ef39861aa21632fdbca0bdd469f78f0096f6449a720f3f39642594af503030e9
 F ext/wasm/api/EXPORTED_FUNCTIONS.sqlite3-api 4c7788042196cecab32f87d8e4965c183fea59037603888059f244b1752babcc
@@ -2067,8 +2067,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 9b97412d3aa791870016ab3c6f565b6a6afa1764f98e969833aec093b9b29919
-R 6b3cc75a9db734dd2c62324fc8b3cb47
+P 58503cd148c9613abfaf7c1386c34806150bd521966864ccbb821ea7dede8e5a
+R 074fed6133dc78bb8d0d984f37c88d73
 U stephan
-Z 73682351de194d18be93f357238f8b87
+Z 7a321f6978c55ea122099ade7e707faf
 # Remove this line to create a well-formed Fossil manifest.
diff --git a/manifest.uuid b/manifest.uuid
index 9502e899d5..55e133b567 100644
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-58503cd148c9613abfaf7c1386c34806150bd521966864ccbb821ea7dede8e5a
\ No newline at end of file
+5d9a14715c25efcd81cadafabf03aad7213251bd1b3dc181939c2dba8d942fb6
\ No newline at end of file