Author: pierre
Date: Sun Jan 27 06:10:07 2019
New Revision: 21045

Log:
Make Rustc and Git P3

Modified:
   trunk/BOOK/general.ent
   trunk/BOOK/general/prog/git.xml
   trunk/BOOK/general/prog/rust.xml
   trunk/BOOK/introduction/welcome/changelog.xml

Modified: trunk/BOOK/general.ent
==============================================================================
--- trunk/BOOK/general.ent      Sat Jan 26 18:38:43 2019        (r21044)
+++ trunk/BOOK/general.ent      Sun Jan 27 06:10:07 2019        (r21045)
@@ -1,12 +1,12 @@
 <!-- $LastChangedBy$ $Date$ -->
 
-<!ENTITY day          "26">                   <!-- Always 2 digits -->
+<!ENTITY day          "27">                   <!-- Always 2 digits -->
 <!ENTITY month        "01">                   <!-- Always 2 digits -->
 <!ENTITY year         "2019">
 <!ENTITY copyrightdate "2001-&year;">
 <!ENTITY copyholder   "The BLFS Development Team">
 <!ENTITY version      "&year;-&month;-&day;">
-<!ENTITY releasedate  "January 26th, &year;">
+<!ENTITY releasedate  "January 27th, &year;">
 <!ENTITY pubdate      "&year;-&month;-&day;"> <!-- metadata req. by TLDP -->
 <!ENTITY blfs-version "svn">                  <!-- svn|[release #] -->
 <!ENTITY lfs-version  "development">          <!-- x.y|development -->

Modified: trunk/BOOK/general/prog/git.xml
==============================================================================
--- trunk/BOOK/general/prog/git.xml     Sat Jan 26 18:38:43 2019        (r21044)
+++ trunk/BOOK/general/prog/git.xml     Sun Jan 27 06:10:07 2019        (r21045)
@@ -107,10 +107,8 @@
 
     <bridgehead renderas="sect4">Recommended</bridgehead>
     <para role="recommended">
-      <xref linkend="curl"/> (needed to use <application>Git</application> 
over http,
-      https, ftp or ftps), and
-      <!-- <xref linkend="perl-error"/>, and -->
-      <xref linkend="python2"/>
+      <xref linkend="curl"/> (needed to use <application>Git</application> over
+      http, https, ftp or ftps)
     </para>
 
     <bridgehead renderas="sect4">Optional</bridgehead>
@@ -118,7 +116,9 @@
       <xref linkend="pcre2"/> (<emphasis>or</emphasis> the deprecated <xref
       linkend="pcre"/>), in either case configured with
       <literal>--enable-jit</literal>,
-      <xref linkend="subversion"/> with Perl bindings (for <command>git 
svn</command>),
+      <xref linkend="python2"/>,
+      <xref linkend="subversion"/> with Perl bindings (for <command>git
+         svn</command>),
       <xref role="runtime" linkend="tk"/>
       (gitk, a simple <application>Git</application>
       repository viewer, uses <application>Tk</application> at runtime), and
@@ -263,8 +263,10 @@
     </para>
 
     <para>
-      <option>--without-python</option>: Use this switch if
-      <application>Python</application> is not installed.
+      <option>--with-python=python3</option>: Use this switch to allow using
+      <application>Python 3</application>. <application>Python</application> is
+      only used for the <command>git p4</command> interface to Perforce
+      repositories.
     </para>
 
     <para>

Modified: trunk/BOOK/general/prog/rust.xml
==============================================================================
--- trunk/BOOK/general/prog/rust.xml    Sat Jan 26 18:38:43 2019        (r21044)
+++ trunk/BOOK/general/prog/rust.xml    Sun Jan 27 06:10:07 2019        (r21045)
@@ -109,7 +109,10 @@
     <note>
       <para>
         Rustc defaults to building for ALL supported architectures, using a
-        shipped copy of LLVM. In BLFS the build is only for the X86 
architecture.
+        shipped copy of LLVM. In BLFS the build is only for the X86
+        architecture. Rustc still claims to require Python 2, but that is only
+        really necessary when building some other architectures with the
+        shipped LLVM.
         If you intend to develop rust crates, this build may not be good
         enough for your purposes.
       </para>
@@ -167,9 +170,8 @@
     <bridgehead renderas="sect4">Required</bridgehead>
     <para role="required">
       <xref linkend="curl"/>,
-      <xref linkend="cmake"/>,
-      <xref linkend="libssh2"/>, and
-      <xref linkend="python2"/>
+      <xref linkend="cmake"/>, and
+      <xref linkend="libssh2"/>
     </para>
 
 <!-- comment out while using shipped LLVM
@@ -181,7 +183,10 @@
 
     <bridgehead renderas="sect4">Optional</bridgehead>
     <para role="optional">
-      <xref linkend="gdb"/> (used by the testsuite if it is present)
+      <xref linkend="gdb"/> (used by the testsuite if it is present) and
+      <xref linkend="python2"/> (if gdb is present, it must have been built
+      with Python 2 support to prevent some tests failing. Furthermore, another
+      test fails if Python 2 is not present)
     </para>
 
     <para condition="html" role="usernotes">
@@ -268,7 +273,7 @@
     </para>
 
 <screen><userinput>export RUSTFLAGS="$RUSTFLAGS -C link-args=-lffi" &amp;&amp;
-./x.py build --exclude src/tools/miri</userinput></screen>
+python3 ./x.py build --exclude src/tools/miri</userinput></screen>
 
     <note>
       <para>
@@ -284,20 +289,22 @@
     </note>
 
     <para>
-      To run the tests issue
-      <command>./x.py test --verbose --no-fail-fast | tee 
rustc-testlog</command>:
-      as with the build, that will use all available CPUs.
+      To run the tests issue <command>python3 ./x.py test --verbose
+      --no-fail-fast | tee rustc-testlog</command>: as with the build, that
+      will use all available CPUs.
     </para>
 
     <para>
       The instructions above do not build ARM compilers, so the testsuite
       <emphasis>will</emphasis> fail and the tests will be reported to end in
       error, with a backtrace of the last failing test. On a good run, 3 tests
-      which need Thumb (ARM) compilers will fail, all  in <filename
+      which need Thumb (ARM) compilers will fail, all in <filename
       class="directory">ui/issues</filename> for issues 37131, 49851 and 50993.
-      Occasionally a fourth test, 
'run-make-fulldeps/sysroot-crates-are-unstable'
+      Occasionally a fourth test,
+      <filename>run-make-fulldeps/sysroot-crates-are-unstable</filename>
       fails. If gdb has been installed, in some circumstances three tests in
-      debuginfo-both also fail. As with all large testsuites, other tests might
+      <filename class="directory">debuginfo</filename> also fail. As with all
+      large testsuites, other tests might
       fail on some machines - if the number of failures is in the single 
digits,
       check the log for 'FAILED' and review lines above that. Any mention of
       SIGSEGV or signal 11 in a failing test is a cause for concern.
@@ -328,7 +335,7 @@
     </para>
 
 <screen><userinput>export LIBSSH2_SYS_USE_PKG_CONFIG=1 &amp;&amp;
-DESTDIR=${PWD}/install ./x.py install &amp;&amp;
+DESTDIR=${PWD}/install python3 ./x.py install &amp;&amp;
 unset LIBSSH2_SYS_USE_PKG_CONFIG</userinput></screen>
 
     <para>
@@ -419,8 +426,8 @@
     </para>
 
     <para>
-      <command>DESTDIR=${PWD}/install ./x.py install</command>: This effects a
-      DESTDIR-style install in the source tree,creating an <filename
+      <command>DESTDIR=${PWD}/install python3 ./x.py install</command>: This
+      effects a DESTDIR-style install in the source tree,creating an <filename
       class="directory">install</filename> directory. Note that DESTDIR 
installs
       need an absolute path, passing 'install' will not work.
     </para>

Modified: trunk/BOOK/introduction/welcome/changelog.xml
==============================================================================
--- trunk/BOOK/introduction/welcome/changelog.xml       Sat Jan 26 18:38:43 
2019        (r21044)
+++ trunk/BOOK/introduction/welcome/changelog.xml       Sun Jan 27 06:10:07 
2019        (r21045)
@@ -41,6 +41,20 @@
       </itemizedlist>
     </listitem>
 -->
+
+    <listitem>
+      <para>January 27th, 2019</para>
+      <itemizedlist>
+        <listitem>
+          <para>[pierre] - Git barely needs Python, and
+          can use Python 3 in the rare cases it is needed.</para>
+        </listitem>
+        <listitem>
+          <para>[pierre] - Reinstate building Rustc with Python 3.</para>
+        </listitem>
+      </itemizedlist>
+    </listitem>
+
     <listitem>
       <para>January 24th, 2019</para>
       <itemizedlist>
-- 
http://lists.linuxfromscratch.org/listinfo/blfs-book
FAQ: http://www.linuxfromscratch.org/blfs/faq.html
Unsubscribe: See the above information page

Reply via email to