Changeset 62f58c7a

Timestamp:

01/25/2019 03:35:52 AM (6 years ago)

Author:

Bruce Dubbs <bdubbs@…>

Branches:

bdubbs/svn

Children:

9324b4e

Parents:

25997c4a

Message:

Add a custom branch

git-svn-id: svn://svn.linuxfromscratch.org/BLFS/branches/bdubbs@21035 af4574ff-66df-0310-9fd7-8a98e5e911e0

Files:

• general/prog/rust.xml (modified) (7 diffs)
• introduction/welcome/changelog.xml (modified) (1 diff)
• multimedia/libdriv/x265.xml (modified) (1 diff)
• packages.ent (modified) (2 diffs)
• postlfs/filesystems/btrfs-progs.xml (modified) (1 diff)

general/prog/rust.xml

@@ -80 +80 @@
         installation before updating. You may wish to do the same to save space.
       </para>
+
+      <para>
+        One alternative when working with multiple versions or just updating
+        to a new version is to place the files in the 
+        <filename class="directory">/opt</filename> directory.  The instructions
+        below provide optional commands to support better control of
+        new package versions or reinstallation of the current version.
+      </para>
     </note>
 
@@ -97 +105 @@
         Rustc defaults to building for ALL supported architectures, using a
         shipped copy of LLVM. In BLFS the build is only for the X86 architecture.
-        If you
-        intend to develop rust crates, this build may not be good enough for your
-        purposes.
+        If you intend to develop rust crates, this build may not be good 
+        enough for your purposes.
       </para>
       <para>
@@ -181 +188 @@
 
     <para>
-      First create a suitable <filename>config.toml</filename> file which will
+      If you are going to install into the
+      <filename class="directory">/opt</filename> directory, remove
+      conflicting entries. As the <systemitem class="username">root</systemitem> 
+      user:
+    </para>
+
+<screen><userinput>rm -rf /opt/rustc /opt/rustc-&rust-version;</userinput></screen>
+
+    <para>
+      Create a suitable <filename>config.toml</filename> file which will
       configure the build. Unlike with previous releases, where even quite old
       system versions of <application>LLVM</application>worked well, this
@@ -202 +218 @@
 
 [build]
-# omiti HTML docs to save time and space (comment this to build them)
+# omit HTML docs to save time and space (comment this to build them)
 docs = false
 
@@ -296 +312 @@
 
     <para>
+      If installing in the <filename class="directory">/opt</filename> 
+      directory, adjust the locations in the DESTDIR directory:
+    </para>
+
+<screen><command>mkdir -p         install/opt/rustc-&rust-version; &amp;&amp;
+mv install/usr/* install/opt/rustc-&rust-version; &amp;&amp;
+rmdir install/usr</command></screen>
+
+    <para>
       Now, as the <systemitem class="username">root</systemitem> user
       install the files from the DESTDIR:
@@ -302 +327 @@
 <screen role="root"><userinput>chown -R root:root install &amp;&amp;
 cp -a install/* /</userinput></screen>
+
+    <para>
+      Finally, if the application is installed in the <filename
+      class="directory">/opt</filename> directory, create a symbolic link to
+      access the current version:
+    </para>
+
+<screen role="root"><userinput>ln -sfnv rustc-&rust-version; /opt/rustc</userinput></screen>
+
+    <note>
+      <para>
+        If multiple versions of <application>Rust</application> are installed
+        in <filename class="directory">/opt</filename>, changing to another
+        version only requires changing the <filename> /opt/rustc</filename>
+        symbolic link.
+      </para>
+    </note>
+
 
   </sect2>
@@ -389 +432 @@
 
   </sect2>
+
+  <sect2 role="configuration">
+    <title>Configuring Rust</title>
+
+    <sect3 id="rustc-config">
+      <title>Configuration Information</title>
+
+      <para>
+        If you installed <application>rustc</application> in
+        <filename class="directory">/opt</filename>, you need to update the
+        following configuration files so that <application>ruxtc</application> is
+        correctly found by other packages and system processes.
+      </para>
+
+      <para>
+        As the <systemitem class="username">root</systemitem> user, update
+        the <filename>/etc/ld.so.conf</filename> file and the dynamic linker's
+        run-time cache file:
+      </para>
+
+<screen role="root"><userinput>cat &gt;&gt; /etc/ld.so.conf &lt;&lt; EOF
+<literal># Begin rustc addition
+
+/opt/rustc/lib
+
+# End rustc addition</literal>
+EOF
+
+ldconfig</userinput></screen>
+
+      <indexterm zone="rustc rustc-config">
+        <primary sortas="e-etc-ld.so.conf">/etc/ld.so.conf</primary>
+      </indexterm>
+
+      <para>
+        As the <systemitem class="username">root</systemitem> user, create
+        the <filename>/etc/profile.d/rustc.sh</filename> file:
+      </para>
+
+<screen role="root"><userinput>cat &gt; /etc/profile.d/rustc.sh &lt;&lt; "EOF"
+<literal># Begin /etc/profile.d/rustc.sh
+
+pathprepend /opt/rustc/bin           PATH
+
+# End /etc/profile.d/rustc.sh</literal>
+EOF</userinput></screen>
+
+      <para>Immediately after installation, update the current PATH 
+      for your current shell as a normal user:</para>
+
+<screen><userinput>source /etc/profile.d/rustc.sh</userinput></screen>
+
+    </sect3>
+  </sect2>
+
 
   <sect2 role="content">

introduction/welcome/changelog.xml

@@ -45 +45 @@
       <para>January 24th, 2019</para>
       <itemizedlist>
+        <listitem>
+          <para>[bdubbs] - Update to btrfs-progs-v4.20.1. Fixes
+          <ulink url="&blfs-ticket-root;11582">#11582</ulink>.</para>
+        </listitem>
+        <listitem>
+          <para>[bdubbs] - Update to x265_3.0. Fixes
+          <ulink url="&blfs-ticket-root;11584">#11584</ulink>.</para>
+        </listitem>
         <listitem>
           <para>[ken] - Update to rustc-1.32.0, needed for the forthcoming

multimedia/libdriv/x265.xml

@@ -7 +7 @@
   <!ENTITY x265-download-http "https://bitbucket.org/multicoreware/x265/downloads/x265_&x265-version;.tar.gz">
   <!ENTITY x265-download-ftp  " ">
-  <!ENTITY x265-md5sum        "693ee4ce7929a59735f441107310f0bb">
+  <!ENTITY x265-md5sum        "8ff1780246bb7ac8506239f6129c04ec">
   <!ENTITY x265-size          "1.3 MB">
   <!ENTITY x265-buildsize     "35 MB">

packages.ent

@@ -48 +48 @@
 
 <!-- Chapter 5 -->
-<!ENTITY btrfs-progs-version          "4.20">
+<!ENTITY btrfs-progs-version          "4.20.1">
 <!ENTITY dosfstools-version           "4.1">
 <!ENTITY fuse3-version                "3.4.1">
@@ -948 +948 @@
 <!ENTITY v4l-utils-version            "1.16.3">
 <!ENTITY x264-version                 "20180819-2245">
-<!ENTITY x265-version                 "2.9">
+<!ENTITY x265-version                 "3.0">
 <!ENTITY xine-lib-version             "1.2.9">
 <!ENTITY xvid-version                 "1.3.5">

postlfs/filesystems/btrfs-progs.xml

@@ -7 +7 @@
   <!ENTITY btrfs-progs-download-http "&kernel-dl;/linux/kernel/people/kdave/btrfs-progs/btrfs-progs-v&btrfs-progs-version;.tar.xz">
   <!ENTITY btrfs-progs-download-ftp  " ">
-  <!ENTITY btrfs-progs-md5sum        "1aaf4f4a306358a0d8c9afd238933589">
+  <!ENTITY btrfs-progs-md5sum        "9aa0a16236c7087ded08425c7256044f">
   <!ENTITY btrfs-progs-size          "1.9 MB">
-  <!ENTITY btrfs-progs-buildsize     "55 MB (add 23 MB for tests)">
-  <!ENTITY btrfs-progs-time          "0.2 SBU (add 7.2 SBU for tests)">
+  <!ENTITY btrfs-progs-buildsize     "55 MB (add 105 MB for tests)">
+  <!ENTITY btrfs-progs-time          "0.2 SBU (add 10 SBU for tests)">
 ]>