From: stephan Date: Sat, 19 Nov 2022 07:44:32 +0000 (+0000) Subject: Default to SQLITE_THREADSAFE=0 and SQLITE_OMIT_LOAD_EXTENSION for wasi builds. X-Git-Tag: version-3.41.0~35^2~15 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=946c317ac6be8b839faede0e9a9fd5b076809f47;p=thirdparty%2Fsqlite.git Default to SQLITE_THREADSAFE=0 and SQLITE_OMIT_LOAD_EXTENSION for wasi builds. FossilOrigin-Name: 382ba3b28409bbc54e6c5c3c9fe78980832e9f33261ee842e3b56e788300f669 --- diff --git a/manifest b/manifest index 4663a26d69..d1c0d7e692 100644 --- a/manifest +++ b/manifest @@ -1,5 +1,5 @@ -C Account\sfor\slack\sof\smmap(),\sgetpid(),\sand\sshared\smemory\sAPIs\sin\swasi. -D 2022-11-19T07:39:31.318 +C Default\sto\sSQLITE_THREADSAFE=0\sand\sSQLITE_OMIT_LOAD_EXTENSION\sfor\swasi\sbuilds. +D 2022-11-19T07:44:32.626 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea F LICENSE.md df5091916dbb40e6e9686186587125e1b2ff51f022cc334e886c19a0e9982724 @@ -641,7 +641,7 @@ F src/resolve.c efea4e5fbecfd6d0a9071b0be0d952620991673391b6ffaaf4c277b0bb674633 F src/rowset.c ba9515a922af32abe1f7d39406b9d35730ed65efab9443dc5702693b60854c92 F src/select.c 9886d6669f5787471aab6ae52af76fad90b53edb1c218fc9ed9d953363bc5184 F src/shell.c.in f5b696b44319a7c820b1b2922ce8d34fdf330337beaa6e87c0fd85c5c92bcd34 -F src/sqlite.h.in 5c27883b53c95c7b44ac3e63378d11fe50f18ad0ec975ae570bf2b01322438b0 +F src/sqlite.h.in 843bf14e3dff296f0b2be440e59094530063bc6052347e23e97e6667ad59acad F src/sqlite3.rc 5121c9e10c3964d5755191c80dd1180c122fc3a8 F src/sqlite3ext.h c4b9fa7a7e2bcdf850cfeb4b8a91d5ec47b7a00033bc996fd2ee96cbf2741f5f F src/sqliteInt.h 1a2cec0f7682da69975eb203fef2058949051ff500445b997d8047cbd8813315 @@ -2057,8 +2057,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 19c04d71bf0f2f44d5a03288cbea3f63cf4eae2fa018ac6be4ae49a321e2b2f3 -R ed76f6c019da486b38eceba46ef5c9a9 +P 80ff026fb4b2203eea53d4930c1e9bb138db951fb408739c7d5c776fb397b665 +R beeafe07073ef1e2ccb7ee0293a95ef3 U stephan -Z 8a0ad9bf871d09c041e33a1999bb3238 +Z 10684edd410c3d649eb3bf1e4a06ed31 # Remove this line to create a well-formed Fossil manifest. diff --git a/manifest.uuid b/manifest.uuid index bbfcae861c..6b8332d051 100644 --- a/manifest.uuid +++ b/manifest.uuid @@ -1 +1 @@ -80ff026fb4b2203eea53d4930c1e9bb138db951fb408739c7d5c776fb397b665 \ No newline at end of file +382ba3b28409bbc54e6c5c3c9fe78980832e9f33261ee842e3b56e788300f669 \ No newline at end of file diff --git a/src/sqlite.h.in b/src/sqlite.h.in index 1a1ef3c143..29ef14c0ff 100644 --- a/src/sqlite.h.in +++ b/src/sqlite.h.in @@ -10477,6 +10477,12 @@ int sqlite3_deserialize( # define SQLITE_WASI 1 # undef SQLITE_OMIT_WAL # define SQLITE_OMIT_WAL 1/* because it requires shared memory APIs */ +# ifndef SQLITE_OMIT_LOAD_EXTENSION +# define SQLITE_OMIT_LOAD_EXTENSION +# endif +# ifndef SQLITE_THREADSAFE +# define SQLITE_THREADSAFE 0 +# endif #endif #ifdef __cplusplus