Changeset ece9683

Timestamp:

09/09/2024 05:21:11 AM (5 weeks ago)

Author:

Xi Ruoyao <xry111@…>

Branches:

lazarus, trunk

Children:

50b10994

Parents:

e668eb1

git-author:

Xi Ruoyao <xry111@…> (09/09/2024 05:19:52 AM)

git-committer:

Xi Ruoyao <xry111@…> (09/09/2024 05:21:11 AM)

Message:

rust: Break long lines, add empty lines to separate multi-line sed, and remove {} and && for "export"

The only way for "export" to fail is an insufficient memory here. And
if the system memory is insufficient basically *everything* will start
to blow up, so we don't need try to salvage.

File:

• general/prog/rust.xml (modified) (2 diffs)

general/prog/rust.xml

@@ -316 +316 @@
     </para>
 
-    <screen><userinput>sed '/MirOpt/d'                        -i src/bootstrap/src/core/builder.rs          &amp;&amp;
-sed 's/!path.ends_with("cargo")/true/' -i src/bootstrap/src/core/build_steps/tool.rs &amp;&amp;
-sed 's/^.*build_wasm.*$/#[allow(unreachable_code)]&amp;return false;/' -i src/bootstrap/src/lib.rs</userinput></screen>
+    <screen><userinput>sed '/MirOpt/d' -i src/bootstrap/src/core/builder.rs &amp;&amp;
+
+sed 's/!path.ends_with("cargo")/true/' \
+    -i src/bootstrap/src/core/build_steps/tool.rs &amp;&amp;
+
+sed 's/^.*build_wasm.*$/#[allow(unreachable_code)]&amp;return false;/' \
+    -i src/bootstrap/src/lib.rs</userinput></screen>
 
     <para>
@@ -330 +334 @@
        src/tools/cargo/Cargo.toml &amp;&amp; -->
 
-<screen><userinput>{ [ ! -e /usr/include/libssh2.h ] || export LIBSSH2_SYS_USE_PKG_CONFIG=1;    } &amp;&amp;
-{ [ ! -e /usr/include/sqlite3.h ] || export LIBSQLITE3_SYS_USE_PKG_CONFIG=1; } &amp;&amp;
+<screen><userinput>[ ! -e /usr/include/libssh2.h ] || export LIBSSH2_SYS_USE_PKG_CONFIG=1
+[ ! -e /usr/include/sqlite3.h ] || export LIBSQLITE3_SYS_USE_PKG_CONFIG=1
 python3 x.py build</userinput></screen>