Changeset 45b2abd3 for general

Timestamp:

03/16/2024 12:58:58 PM (2 months ago)

Author:

Xi Ruoyao <xry111@…>

Branches:

lazarus, trunk

Children:

c1325868

Parents:

a4da374

git-author:

Xi Ruoyao <xry111@…> (03/15/2024 02:54:40 PM)

git-committer:

Xi Ruoyao <xry111@…> (03/16/2024 12:58:58 PM)

Message:

rust: Add sqlite as recommended and allow building cargo with system sqlite

Just observed when cargo was built we were spending minutes building a
bundled copy of sqlite. Let's stop it.

File:

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

general/prog/rust.xml

@@ -171 +171 @@
     <bridgehead renderas="sect4">Recommended</bridgehead>
     <para role="recommended">
-      <xref linkend="libssh2"/> and
+      <xref linkend="libssh2"/>,
       <xref linkend="llvm"/>
       (built with -DLLVM_LINK_LLVM_DYLIB=ON so that rust can link to
-      system LLVM instead of building its shipped version)
+      system LLVM instead of building its shipped version), and
+      <xref linkend="sqlite"/>
     </para>
 
@@ -363 +364 @@
 
 <screen><userinput>{ [ ! -e /usr/include/libssh2.h ] ||
-  export LIBSSH2_SYS_USE_PKG_CONFIG=1; } &amp;&amp;
+  export LIBSSH2_SYS_USE_PKG_CONFIG=1; }    &amp;&amp;
+{ [ ! -e /usr/include/sqlite3.h ] ||
+  export LIBSQLITE3_SYS_USE_PKG_CONFIG=1; } &amp;&amp;
 python3 x.py build</userinput></screen>
 
@@ -450 +453 @@
         If <command>sudo</command> or <command>su</command> is invoked for
         switching to the &root; user, ensure
-        <envar>LIBSSH2_SYS_USE_PKG_CONFIG</envar> is correctly passed or the
-        following command may completely rebuild this package.  For
-        <command>sudo</command>, use the
-        <option>--preserve-env=LIBSSH2_SYS_USE_PKG_CONFIG</option> option.
-        For <command>su</command>, do <emphasis>not</emphasis> use the
-        <option>-</option> or <option>--login</option> options.
+        <envar>LIBSSH2_SYS_USE_PKG_CONFIG</envar> and
+        <envar>LIBSQLITE3_SYS_USE_PKG_CONFIG</envar> are correctly passed or
+        the following command may rebuild <command>cargo</command> with
+        shipped copies of libssh2 and sqlite.  For <command>sudo</command>,
+        use the
+        <option>--preserve-env=LIB{SSH2,SQLITE3}_SYS_USE_PKG_CONFIG</option>
+        option.  For <command>su</command>, do <emphasis>not</emphasis> use
+        the <option>-</option> or <option>--login</option> options.
       </para>
     </note>
@@ -481 +486 @@
 
     <para>
-      Finally, unset the <envar>LIBSSH2_SYS_USE_PKG_CONFIG</envar> variable:
-    </para>
-
-<screen><userinput>unset LIBSSH2_SYS_USE_PKG_CONFIG</userinput></screen>
+      Finally, unset the exported environment variables:
+    </para>
+
+<screen><userinput>unset LIB{SSH2,SQLITE3}_SYS_USE_PKG_CONFIG</userinput></screen>
 
   </sect2>
@@ -548 +553 @@
       <command>export LIBSSH2_SYS_USE_PKG_CONFIG=1</command>: Allow
       <command>cargo</command> to link to system libssh2.
+    </para>
+
+    <!-- src/tools/cargo/Cargo.toml is specifying "bundled" as the
+         upstream is suggesting to avoid issues building for Windoge.
+         We don't care about Windoge so override this if we have
+         system sqlite3.  -->
+    <para>
+      <command>export LIBSQLITE3_SYS_USE_PKG_CONFIG</command>: Allow
+      <command>cargo</command> to link to system sqlite.
     </para>