Changeset e408cb0 for chapter06

Timestamp:

01/25/2016 12:03:45 AM (8 years ago)

Author:

Bruce Dubbs <bdubbs@…>

Branches:

10.0, 10.0-rc1, 10.1, 10.1-rc1, 11.0, 11.0-rc1, 11.0-rc2, 11.0-rc3, 11.1, 11.1-rc1, 11.2, 11.2-rc1, 11.3, 11.3-rc1, 12.0, 12.0-rc1, 12.1, 12.1-rc1, 7.9, 8.0, 8.1, 8.2, 8.3, 8.4, 9.0, 9.1, arm, bdubbs/gcc13, ml-11.0, multilib, renodr/libudev-from-systemd, s6-init, trunk, xry111/arm64, xry111/arm64-12.0, xry111/clfs-ng, xry111/lfs-next, xry111/loongarch, xry111/loongarch-12.0, xry111/loongarch-12.1, xry111/mips64el, xry111/pip3, xry111/rust-wip-20221008, xry111/update-glibc

Children:

f1dd547

Parents:

e691c77

Message:

Update to coreutils-8.25. Fixes
Simplify bash installation procedures.

git-svn-id: ​http://svn.linuxfromscratch.org/LFS/trunk/BOOK@10988 4aa44e1e-78dd-0310-a6d2-fbcd4c07a689

Location:

chapter06

Files:

• bash.xml (modified) (2 diffs)
• chapter06.xml (modified) (2 diffs)
• coreutils.xml (modified) (2 diffs)

chapter06/bash.xml

@@ -49 +49 @@
 
 <screen><userinput remap="configure">./configure --prefix=/usr                       \
-            --bindir=/bin                       \
             --docdir=/usr/share/doc/bash-&bash-version; \
             --without-bash-malloc               \
@@ -85 +84 @@
 <screen><userinput remap="test">su nobody -s /bin/bash -c "PATH=$PATH make tests"</userinput></screen>
 
-    <para>Install the package:</para>
+    <para>Install the package and move the main executable to
+    <filename class='directory'>/bin</filename>:</para>
 
-<screen><userinput remap="install">make install</userinput></screen>
+<screen><userinput remap="install">make install
+mv -vf /usr/bin/bash /bin</userinput></screen>
 
     <para>Run the newly compiled <command>bash</command> program (replacing the one that is

chapter06/chapter06.xml

@@ -42 +42 @@
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="procps.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="e2fsprogs.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="coreutils.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="iana-etc.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="m4.xml"/>
@@ -63 +62 @@
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="autoconf.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="automake.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="coreutils.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="diffutils.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="gawk.xml"/>

chapter06/coreutils.xml

@@ -49 +49 @@
     <para>POSIX requires that programs from Coreutils recognize character
     boundaries correctly even in multibyte locales. The following patch fixes
-    this non-compliance and other internationalization-related bugs.
-    <!--Afterwards make sure the timestamp for <filename>Makefile.in</filename> is
-    later than all other files to prevent a <command>make</command>
-    error:</para>-->
-    Afterwards disable a test that fails with the current version of perl.</para>
-
-<screen><userinput remap="pre">patch -Np1 -i ../&coreutils-i18n-patch; 
-sed -i '/tests\/misc\/sort.pl/ d' Makefile.in</userinput></screen>
-
-<!--touch Makefile.in</userinput></screen>-->
+    this non-compliance and other internationalization-related bugs.</para>
+
+<screen><userinput remap="pre">patch -Np1 -i ../&coreutils-i18n-patch;</userinput></screen>
 
     <note>
@@ -96 +89 @@
     <para>Compile the package:</para>
 
-<screen><userinput remap="make">make</userinput></screen>
+<screen><userinput remap="make">FORCE_UNSAFE_CONFIGURE=1 make</userinput></screen>
 
     <para>Skip down to <quote>Install the