Reformulate a (sed -i) construct in ext/wasm/GNUmakefile to account for Mac's sed...

FossilOrigin-Name: 907dfc4a7aa129cdcedeb3ba2d75e1b68a8f22c2545ee1c8cf7d705041644e5c

diff --git a/ext/wasm/GNUmakefile b/ext/wasm/GNUmakefile
index 8fedaee7b6cbdc71ba99d7b74705e12275678e1d..2346773337e24d5ffe9e3b9d4bd585cc81bcdbb8 100644 (file)
--- a/ext/wasm/GNUmakefile
+++ b/ext/wasm/GNUmakefile
@@ -677,10 +677,15 @@ sqlite3-wasmfs.cfiles := $(sqlite3-wasm.cfiles)
 #
 # Upstream RFE:
 # https://github.com/emscripten-core/emscripten/issues/18237
+#
+# Maintenance reminder: Mac sed -i works differently than GNU sed, so
+# don't use that flag here.
 define SQLITE3.xJS.ESM-EXPORT-DEFAULT
 if [ x1 = x$(1) ]; then \
                echo "Fragile workaround for emscripten/issues/18237. See SQLITE3.xJS.RECIPE."; \
-               sed -i -e '0,/^export default/{/^export default/d;}' $@ || exit $$?; \
+               {\
+                       sed -e '0,/^export default/{/^export default/d;}' $@ > $@.tmp && mv $@.tmp $@; \
+               } || exit $$?; \
                if [ x != x$(2) ]; then \
                        if ! grep -q '^export default' $@; then \
                                echo "Cannot find export default." 1>&2; \

diff --git a/manifest b/manifest
index 8d61da8af1c70faae6da48ccb5d371c539e4e42c..55ef9f2d35258f276c00efc80adf4b8ec0891f0e 100644 (file)
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Resolve\san\sES6\smodule\sexport\sconstruct\swhich\sis\sincompatible\swith\snode.js,\sas\sreported\sin\s[forum:b9680fa9ad|forum\spost\sb9680fa9ad].
-D 2023-07-24T15:41:58.448
+C Reformulate\sa\s(sed\s-i)\sconstruct\sin\sext/wasm/GNUmakefile\sto\saccount\sfor\sMac's\ssed\s-i\sbeing\sdifferent\sthan\sGNU's.
+D 2023-07-25T12:26:05.338
 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
 F LICENSE.md df5091916dbb40e6e9686186587125e1b2ff51f022cc334e886c19a0e9982724
@@ -482,7 +482,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 4e8260d05c52d9924b853efbdfe052bd483cfe42f055567c1bbf29d274794b22
+F ext/wasm/GNUmakefile a3e316bf51d8915a49d4728e0d41f19ec4c3ead3409d1171989a4fe163ec2214
 F ext/wasm/README-dist.txt 6382cb9548076fca472fb3330bbdba3a55c1ea0b180ff9253f084f07ff383576
 F ext/wasm/README.md 0895244c0539ae68cf8c70d59c2de512532fd47cfba313268e2b672e6359112e
 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 c1b080e39397c983c13a5e79303223827de7b4946c18a79396851ec1814782f3
-R 1ab3847cf4557b99f62130a0f45e24bd
+P 80927c3913561dddf75cf73be871d93ae06b16f83e8cc36fc360765014209615
+R 6a5bd7ff24557139b19e78c4a48cb406
 U stephan
-Z 4a3a3c6a8d937dc54de34852d2276ed0
+Z 524f840828c91fa63ac22024dbea11bc
 # Remove this line to create a well-formed Fossil manifest.

diff --git a/manifest.uuid b/manifest.uuid
index 649aa580be24c42a7c3036499d89c5df4fdcf71e..d8bafbc0f91a873954a2a4e581c55de5af148761 100644 (file)
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-80927c3913561dddf75cf73be871d93ae06b16f83e8cc36fc360765014209615
\ No newline at end of file
+907dfc4a7aa129cdcedeb3ba2d75e1b68a8f22c2545ee1c8cf7d705041644e5c
\ No newline at end of file