From: stephan Date: Thu, 15 Dec 2022 02:26:13 +0000 (+0000) Subject: Remove an unnecessary/obsolete Emscripten-specific export. X-Git-Tag: version-3.41.0~242 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=d60061616fbec1deb0c0d22f31ef016a9a76a450;p=thirdparty%2Fsqlite.git Remove an unnecessary/obsolete Emscripten-specific export. FossilOrigin-Name: fa278022afd6dd6e499d26f74a8359f3e9973e1680772059ce331b64e77ec582 --- diff --git a/ext/wasm/GNUmakefile b/ext/wasm/GNUmakefile index 0f8004615d..370ea681f9 100644 --- a/ext/wasm/GNUmakefile +++ b/ext/wasm/GNUmakefile @@ -461,10 +461,7 @@ emcc.jsflags += -sDYNAMIC_EXECUTION=0 emcc.jsflags += -sNO_POLYFILL emcc.jsflags += -sEXPORTED_FUNCTIONS=@$(EXPORTED_FUNCTIONS.api) emcc.exportedRuntimeMethods := \ - -sEXPORTED_RUNTIME_METHODS=FS,wasmMemory - # FS ==> stdio/POSIX I/O proxies. Currently used explicitly only - # by the fiddle app, and it must never be exposed to client code - # via our APIs. + -sEXPORTED_RUNTIME_METHODS=wasmMemory # wasmMemory ==> required by our code for use with -sIMPORTED_MEMORY emcc.jsflags += $(emcc.exportedRuntimeMethods) emcc.jsflags += -sUSE_CLOSURE_COMPILER=0 diff --git a/ext/wasm/fiddle.make b/ext/wasm/fiddle.make index 71602114a9..1ef6436c95 100644 --- a/ext/wasm/fiddle.make +++ b/ext/wasm/fiddle.make @@ -39,6 +39,7 @@ fiddle.emcc-flags = \ $(sqlite3.js.flags.--post-js) \ $(emcc.exportedRuntimeMethods) \ -sEXPORTED_FUNCTIONS=@$(abspath $(EXPORTED_FUNCTIONS.fiddle)) \ + -sEXPORTED_RUNTIME_METHODS=FS,wasmMemory \ $(SQLITE_OPT) $(SHELL_OPT) \ -DSQLITE_SHELL_FIDDLE # -D_POSIX_C_SOURCE is needed for strdup() with emcc diff --git a/manifest b/manifest index 3cfa4d2e3d..f082e70724 100644 --- a/manifest +++ b/manifest @@ -1,5 +1,5 @@ -C Fix\sminor\sproblems\sin\sthe\snew\ssqlite3ExprDataType()\sfunction. -D 2022-12-14T23:53:29.854 +C Remove\san\sunnecessary/obsolete\sEmscripten-specific\sexport. +D 2022-12-15T02:26:13.244 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 32ad3deb3005a72d1955e28fa375e01e976cda01f0bc4ddd3fec93006fa3fa04 +F ext/wasm/GNUmakefile 32e5d1929d3e4d7c5892208d8078453e57339af8f7e9be320cdf96b2d60c69ba F ext/wasm/README-dist.txt 2d670b426fc7c613b90a7d2f2b05b433088fe65181abead970980f0a4a75ea20 F ext/wasm/README.md ef39861aa21632fdbca0bdd469f78f0096f6449a720f3f39642594af503030e9 F ext/wasm/api/EXPORTED_FUNCTIONS.sqlite3-api 3883604dfda98352ff7ea76b2092f406d8c1ebc576e16b8c6e470fa2b1724880 @@ -532,7 +532,7 @@ F ext/wasm/demo-worker1-promiser.js b85a2bb1b918db4f09dfa24419241cb3edad77913894 F ext/wasm/demo-worker1.html 2c178c1890a2beb5a5fecb1453e796d067a4b8d3d2a04d65ca2eb1ab2c68ef5d F ext/wasm/demo-worker1.js a619adffc98b75b66c633b00f747b856449a134a9a0357909287d80a182d70fa F ext/wasm/dist.make 5523b02e824db5ab8176e3eedc2e709fe1204d8f4d6e52e8321cdf6830114b72 -F ext/wasm/fiddle.make 2812c44c9bafb5be9c8767963d1b9f374d77af7795fcaa06483c03e7059dea74 +F ext/wasm/fiddle.make d5308b5c35f691758ef20badd25f91f3780b20415760daf0d98afbe4f24921b9 F ext/wasm/fiddle/emscripten.css 3d253a6fdb8983a2ac983855bfbdd4b6fa1ff267c28d69513dd6ef1f289ada3f F ext/wasm/fiddle/fiddle-worker.js b4a0c8ab6c0983218543ca771c45f6075449f63a1dcf290ae5a681b2cba8800d F ext/wasm/fiddle/fiddle.js 974b995119ac443685d7d94d3b3c58c6a36540e9eb3fed7069d5653284071715 @@ -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 0b58d1b354a0f91bafeafee102acedd4654dc420afdf4eb4aaac9bf5bcb63c1f -R 7cbfdf44a5f1881085f07267777096c9 -U drh -Z 9418ec076c73edb8fe693b27dc219a65 +P c1d5261b222bbf94c20e558089f3d2eae6a88b6d739225ee4f7d0338e0e59994 +R 918e16f92d23cc300804b300dc026e25 +U stephan +Z e5f6c496f6861a48778111a469988478 # Remove this line to create a well-formed Fossil manifest. diff --git a/manifest.uuid b/manifest.uuid index 3f8d9ae3fb..a6b0edf399 100644 --- a/manifest.uuid +++ b/manifest.uuid @@ -1 +1 @@ -c1d5261b222bbf94c20e558089f3d2eae6a88b6d739225ee4f7d0338e0e59994 \ No newline at end of file +fa278022afd6dd6e499d26f74a8359f3e9973e1680772059ce331b64e77ec582 \ No newline at end of file