Changeset f2ae6ba8

Timestamp:

10/08/2022 11:04:53 AM (19 months ago)

Author:

Xi Ruoyao <xry111@…>

Branches:

11.3, 12.0, 12.1, kea, ken/TL2024, ken/inkscape-core-mods, ken/tuningfonts, lazarus, lxqt, plabs/newcss, plabs/python-mods, python3.11, qt5new, rahul/power-profiles-daemon, renodr/vulkan-addition, trunk, xry111/llvm18, xry111/xf86-video-removal

Children:

13d9cb6a

Parents:

1e9ccfa

git-author:

Xi Ruoyao <xry111@…> (10/08/2022 11:02:47 AM)

git-committer:

Xi Ruoyao <xry111@…> (10/08/2022 11:04:53 AM)

Message:

rustc: demote curl and libssh2 to recommended

And, adjust LIBSSH2_SYS_USE_PKG_CONFIG according to if libssh2 is
installed. Export it earlier so x.py build and x.py install will use
the same LIBSSH2_SYS_USE_PKG_CONFIG value. This can reduce some
repeated building process.

File:

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

general/prog/rust.xml

@@ -201 +201 @@
     <bridgehead renderas="sect4">Required</bridgehead>
     <para role="required">
-      <xref linkend="curl"/>,
-      <xref linkend="cmake"/>, and
-      <xref linkend="libssh2"/>
+      <xref linkend="cmake"/>
     </para>
 
     <bridgehead renderas="sect4">Recommended</bridgehead>
     <para role="recommended">
+      <xref linkend="curl"/>,
+      <xref linkend="libssh2"/>, and
       <xref linkend="llvm"/>
       (built with -DLLVM_LINK_LLVM_DYLIB=ON so that rust can link to
       system LLVM instead of building its shipped version)
     </para>
+
+    <note>
+      <para>
+        If a recommended dependency is not installed, a shipped copy in the
+        Rustc source tarball will be built and used.
+      </para>
+    </note>
 
     <bridgehead renderas="sect4">Optional</bridgehead>
@@ -337 +344 @@
 
 <screen><userinput>export RUSTFLAGS="$RUSTFLAGS -C link-args=-lffi" &amp;&amp;
+{ [ ! -e /usr/include/libssh2.h ] ||
+  export LIBSSH2_SYS_USE_PKG_CONFIG=1; } &amp;&amp;
 python3 ./x.py build --exclude src/tools/miri</userinput></screen>
 
@@ -415 +424 @@
     </para>
 
-<screen><userinput>export LIBSSH2_SYS_USE_PKG_CONFIG=1 &amp;&amp;
-DESTDIR=${PWD}/install python3 ./x.py install &amp;&amp;
+<screen><userinput>DESTDIR=${PWD}/install python3 ./x.py install &amp;&amp;
 unset LIBSSH2_SYS_USE_PKG_CONFIG</userinput></screen>
 
@@ -513 +521 @@
     </para>
 
-    <para>
-      <command>export LIBSSH2_SYS_USE_PKG_CONFIG=1</command>: On some systems,
-      cairo fails to link during the install because it cannot find libssh2.
-      This seems to fix it, but again the reason why the problem occurs is not
-      understood.
+    <!-- https://github.com/alexcrichton/ssh2-rs/issues/173 -->
+    <para>
+      <command>export LIBSSH2_SYS_USE_PKG_CONFIG=1</command>: Allow
+      <command>cargo</command> to link to system libssh2.
     </para>