From: drh <drh@noemail.net>
Date: Tue, 23 Jun 2020 17:57:08 +0000 (+0000)
Subject: Try to remove end-of-line whitespace when building the amalgamation.
X-Git-Tag: version-3.33.0~105
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=24aee8af6e1f5072a181900dce00ba50916e5a06;p=thirdparty%2Fsqlite.git

Try to remove end-of-line whitespace when building the amalgamation.

FossilOrigin-Name: be3e7814e4cdbc09eaa5112d7d4135b3a2cedbfe66217d9973b1b39a44464e93
---

diff --git a/manifest b/manifest
index 22fdff5e28..0b3bcbb7cb 100644
--- a/manifest
+++ b/manifest
@@ -1,13 +1,15 @@
 B 7a876209a678a34c198b54ceef9e3c041f128a14dc73357f6a57cadadaa6cf7b
-C Fix\sproblems\swith\shandling\sreturn\svalue\sof\smmap()\sin\slsm_unix.c\s(mmap()\sreturns\sMAP_FAILED\son\serror,\snot\sNULL).
-D 2020-06-22T16:02:06.546
+C Try\sto\sremove\send-of-line\swhitespace\swhen\sbuilding\sthe\samalgamation.
+D 2020-06-23T17:57:08.246
 F Makefile.in 50fc38e4f846af70c248542d2ad4e3bca3d80e3f1b9137ce79b047743d4b642c
 F autoconf/Makefile.am a8d1d24affe52ebf8d7ddcf91aa973fa0316618ab95bb68c87cabf8faf527dc8
 F ext/lsm1/lsm_unix.c 11e0a5c19d754a4e1d93dfad06de8cc201f10f886b8e61a4c599ed34e334fc24
 F main.mk f3c3de159abc51086a16a72d0b48077d2dda6a8dfb96963f8a010136bfd98108
 F src/build.c ba1bbe563a3dc02d5fed20537603181e5289c13ea30ae5e775f552e7557adbfa
 F tool/mkautoconfamal.sh f62353eb6c06ab264da027fd4507d09914433dbdcab9cb011cdc18016f1ab3b8
-P 067291143a63db924ead4810defb4bc6f195557412f5d1c22299f30d2d9f2a79
-R 9efb2d1123c6a5a0cabb094674cf03d3
-U dan
-Z 1b07d7a82a5b86877bd90626c66f8988
+F tool/mksqlite3c.tcl f4ef476510eca4124c874a72029f1e01bc54a896b1724e8f9eef0d8bfae0e84c
+F tool/mksqlite3h.tcl 1f5e4a1dbbbc43c83cc6e74fe32c6c620502240b66c7c0f33a51378e78fc4edf
+P da06168c09df5c0e8e10d0f9618e69217d4c0173a8199660bad2805f009d7b08
+R 7af66bc76cb343914228fa6828a4ffad
+U drh
+Z a5bf96a8fc83efdbdbe4a96339c12501
diff --git a/manifest.uuid b/manifest.uuid
index 9663d41330..4b407558c0 100644
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-da06168c09df5c0e8e10d0f9618e69217d4c0173a8199660bad2805f009d7b08
\ No newline at end of file
+be3e7814e4cdbc09eaa5112d7d4135b3a2cedbfe66217d9973b1b39a44464e93
\ No newline at end of file
diff --git a/tool/mksqlite3c.tcl b/tool/mksqlite3c.tcl
index 55ad89d086..36663ff3b1 100644
--- a/tool/mksqlite3c.tcl
+++ b/tool/mksqlite3c.tcl
@@ -183,7 +183,7 @@ proc copy_file {filename} {
   }
   set declpattern ^$declpattern\$
   while {![eof $in]} {
-    set line [gets $in]
+    set line [string trimright [gets $in]]
     incr ln
     if {[regexp {^\s*#\s*include\s+["<]([^">]+)[">]} $line all hdr]} {
       if {[info exists available_hdr($hdr)]} {
diff --git a/tool/mksqlite3h.tcl b/tool/mksqlite3h.tcl
index 216bd4e60b..9078a15753 100644
--- a/tool/mksqlite3h.tcl
+++ b/tool/mksqlite3h.tcl
@@ -107,7 +107,7 @@ foreach file $filelist {
   }
   while {![eof $in]} {
 
-    set line [gets $in]
+    set line [string trimright [gets $in]]
 
     # File sqlite3rtree.h contains a line "#include <sqlite3.h>". Omit this
     # line when copying sqlite3rtree.h into sqlite3.h.