Changeset 229ed25 for BOOK/temp-system/common/coreutils.xml

Timestamp:

Jan 4, 2014, 12:03:38 AM (11 years ago)

Author:

Chris Staub <chris@…>

Branches:

clfs-3.0.0-systemd, clfs-3.0.0-sysvinit, master, systemd, sysvinit

Children:

f90d077

Parents:

ec008670 (diff), e57ce38 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge branch 'master' into systemd

Conflicts:

BOOK/appendices/dependencies/common.xml
BOOK/boot/common/devices.xml
BOOK/boot/common/pwdgroup.xml
BOOK/boot/ppc64-64/powerpc-utils.xml
BOOK/boot/ppc64/util-linux-32.xml
BOOK/bootscripts/common/bootscripts.xml
BOOK/final-system/alpha-chapter.xml
BOOK/final-system/common/coreutils.xml
BOOK/final-system/common/eudev.xml
BOOK/final-system/common/kbd.xml
BOOK/final-system/mips-chapter.xml
BOOK/final-system/mips64-64-chapter.xml
BOOK/final-system/mips64-chapter.xml
BOOK/final-system/multilib/udev-64bit.xml
BOOK/final-system/multilib/util-linux.xml
BOOK/final-system/ppc-chapter.xml
BOOK/final-system/ppc64-chapter.xml
BOOK/final-system/sparc-chapter.xml
BOOK/final-system/sparc64-64-chapter.xml
BOOK/final-system/sparc64-chapter.xml
BOOK/final-system/x86-chapter.xml
BOOK/final-system/x86_64-64-chapter.xml
BOOK/final-system/x86_64-chapter.xml
BOOK/introduction/common/changelog.xml
BOOK/materials/common/packages.xml
BOOK/packages.ent

File:

• BOOK/temp-system/common/coreutils.xml (modified) (3 diffs)

BOOK/temp-system/common/coreutils.xml

@@ -23 +23 @@
     <title>Installation of Coreutils</title>
 
-    <para os="aa">The following command updates the timestamps on the uname
-    and hostname man pages so that the Makefile does not attempt to regenerate
-    them:</para>
-
-<screen os="ab"><userinput>touch man/uname.1 man/hostname.1</userinput></screen>
-
     <para os="ba">Configure can not properly determine how to get free space
     when cross-compiling - as a result, the <command>df</command> program will
@@ -39 +33 @@
 EOF</userinput></screen>
 
+    <para os="p1">Apply a patch to not generate manpages :</para>
+
+<screen os="p2"><userinput>patch -Np1 -i ../&coreutils-noman-patch;</userinput></screen>
+
     <para os="bd">Prepare Coreutils for compilation:</para>
 
@@ -44 +42 @@
     --build=${CLFS_HOST} --host=${CLFS_TARGET} \
     --enable-install-program=hostname --cache-file=config.cache</userinput></screen>
+
+    <variablelist os="be1">
+      <title>The meaning of the new configure option:</title>
+
+      <varlistentry>
+        <term><parameter>--enable-install-program=hostname</parameter></term>
+        <listitem>
+          <para>Tells Coreutils to install <command>hostname</command>,
+          which is needed for the Perl testsuite.</para>
+        </listitem>
+      </varlistentry>
+
+    </variablelist>
+
+    <para os="s1">Apply a sed to allow completion of the build:</para>
+
+<screen os="s2"><userinput>cp -v Makefile{,.orig}
+sed -e 's/^#run_help2man\|^run_help2man/#&amp;/' \
+  -e 's/^\##run_help2man/run_help2man/' Makefile.orig > Makefile</userinput></screen>
 
    <para os="bf">Compile the package:</para>