linux-from-scratch/glfs
1
0
Fork 0
mirror of https://github.com/Zeckmathederg/glfs.git synced 2025-02-03 14:47:17 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

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

Browse Source 
Just observed when cargo was built we were spending minutes building a
bundled copy of sqlite.  Let's stop it.
This commit is contained in:
Xi Ruoyao 2024-03-15 22:54:40 +08:00
parent a4da374202
commit 45b2abd359
No known key found for this signature in database
GPG Key ID: ACAAD20E19E710E3
1 changed files with 25 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
general/prog/rust.xml
View File

@ -170,10 +170,11 @@
<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>
<note>
@ -362,7 +363,9 @@ sed '/static_assert_size!\((Lit|MetaItemLit|BasicBlockData|Terminator)/d' \
src/tools/cargo/Cargo.toml &amp;&amp; -->
<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>
<note>
@ -449,12 +452,14 @@ python3 x.py test --verbose --no-fail-fast | tee rustc-testlog</userinput></scre
<para>
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>
@ -480,10 +485,10 @@ ln -sfv /opt/rustc/share/zsh/site-functions/_cargo \
/usr/share/zsh/site-functions</userinput></screen>
<para>
Finally, unset the <envar>LIBSSH2_SYS_USE_PKG_CONFIG</envar> variable:
Finally, unset the exported environment variables:
</para>
<screen><userinput>unset LIBSSH2_SYS_USE_PKG_CONFIG</userinput></screen>
<screen><userinput>unset LIB{SSH2,SQLITE3}_SYS_USE_PKG_CONFIG</userinput></screen>
</sect2>
@ -549,6 +554,15 @@ ln -sfv /opt/rustc/share/zsh/site-functions/_cargo \
<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>
<!--<para>
<command>export RUSTFLAGS="$RUSTFLAGS -C link-args=-lffi"</command>:
This adds a link to libffi to any RUSTFLAGS you may already be passing