Changeset b75237d for chapter06

Timestamp:

01/25/2016 05:18:52 AM (8 years ago)

Author:

DJ Lucas <dj@…>

Branches:

7.9-systemd

Children:

b6ceddb

Parents:

ee46f60

Message:

Merge from trunk r10988.

git-svn-id: ​http://svn.linuxfromscratch.org/LFS/branches/systemd@10989 4aa44e1e-78dd-0310-a6d2-fbcd4c07a689

Location:

chapter06

Files:

• bash.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/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