[Clfs-commits] [Cross-LFS]Cross-LFS Book branch, master, updated. da3e72739249aa24c29222f06739e8960e0c3664

git git at cross-lfs.org
Mon Nov 5 15:35:21 PST 2012


This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "Cross-LFS Book".

The branch, master has been updated
       via  da3e72739249aa24c29222f06739e8960e0c3664 (commit)
       via  090ff24e46fc0eb9ca8a2e5ee1df8bd11e4ab6e7 (commit)
      from  e61fedb5bb29f5abf8ad21f9a02de6899c9bcfc7 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit da3e72739249aa24c29222f06739e8960e0c3664
Author: William Harrington <kb0iic at gmail.com>
Date:   Mon Nov 5 17:35:16 2012 -0600

    Add coreutils temp system fix.

diff --git a/BOOK/temp-system/common/coreutils.xml b/BOOK/temp-system/common/coreutils.xml
index c1ed494..81f9342 100644
--- a/BOOK/temp-system/common/coreutils.xml
+++ b/BOOK/temp-system/common/coreutils.xml
@@ -44,6 +44,20 @@ EOF</userinput></screen>
     --build=${CLFS_HOST} --host=${CLFS_TARGET} \
     --enable-install-program=hostname --cache-file=config.cache</userinput></screen>
 
+<!--- Hack for coreutils to build for target executables which can't be ran with the host. -->
+    <para os="h1">Coreutils does not build make-prime-list properly and the host cannot execute it. We build it using the host compiler so it can be executed for the generation of data required for the build.</para>
+
+<screen os="h2"><userinput>sed '/src_make_prime_list/d' -i Makefile
+    depbase=`echo src/make-prime-list.o | sed 's|[^/]*$|.deps/&|;s|\.o$||'`;
+    gcc -std=gnu99  -I. -I./lib  -Ilib -I./lib -Isrc -I./src  -fdiagnostics-show-option -funit-at-a-time -g -O2 -MT src/make-prime-list.o -MD -MP -MF $depbase.Tpo -c -o src/make-prime-list.o src/make-prime-list.c
+    mv -f $depbase.Tpo $depbase.Po
+    gcc -std=gnu99 -fdiagnostics-show-option -funit-at-a-time -g -O2 -Wl,--as-needed  -o src/make-prime-list src/make-prime-list.o</userinput></screen>
+
+    <para os="h3">Remove the building of the hostname man page as it is affected by the previous commands.</para>
+
+<screen os="h4"><userinput>sed -i '/hostname.1/d' -i Makefile</userinput></screen>
+<!-- End hack -->
+
    <para os="bf">Compile the package:</para>
 
 <screen os="bg"><userinput>make</userinput></screen>
diff --git a/BOOK/temp-system/multilib/coreutils.xml b/BOOK/temp-system/multilib/coreutils.xml
index 7b2a7c1..2daf21a 100644
--- a/BOOK/temp-system/multilib/coreutils.xml
+++ b/BOOK/temp-system/multilib/coreutils.xml
@@ -46,6 +46,28 @@
     --build=${CLFS_HOST} --host=${CLFS_TARGET} \
     --enable-install-program=hostname --cache-file=config.cache</userinput></screen>
 
+<!--- Hack for coreutils to build for target executables which can't be ran with the host. -->
+
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+    href="../common/coreutils.xml"
+    xpointer="xpointer(//*[@os='h1'])"/>
+
+<screen os="h2"><userinput>sed '/src_make_prime_list/d' -i Makefile
+    depbase=`echo src/make-prime-list.o | sed 's|[^/]*$|.deps/&|;s|\.o$||'`;
+    gcc ${BUILD64} -std=gnu99  -I. -I./lib  -Ilib -I./lib -Isrc -I./src  -fdiagnostics-show-option -funit-at-a-time -g -O2 -MT src/make-prime-list.o -MD -MP -MF $depbase.Tpo -c -o src/make-prime-list.o src/make-prime-list.c
+    mv -f $depbase.Tpo $depbase.Po
+    gcc ${BUILD64} -std=gnu99 -fdiagnostics-show-option -funit-at-a-time -g -O2 -Wl,--as-needed  -o src/make-prime-list src/make-prime-list.o</userinput></screen>
+
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+    href="../common/coreutils.xml"
+    xpointer="xpointer(//*[@os='h3'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+    href="../common/coreutils.xml"
+    xpointer="xpointer(//*[@os='h4'])"/>
+
+<!-- end hack -->
+
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     href="../common/coreutils.xml"
     xpointer="xpointer(//*[@os='bf'])"/>

commit 090ff24e46fc0eb9ca8a2e5ee1df8bd11e4ab6e7
Author: William Harrington <kb0iic at gmail.com>
Date:   Mon Nov 5 17:34:54 2012 -0600

    Update master change log.

diff --git a/BOOK/introduction/common/changelog.xml b/BOOK/introduction/common/changelog.xml
index 2e64d27..f2e4e77 100644
--- a/BOOK/introduction/common/changelog.xml
+++ b/BOOK/introduction/common/changelog.xml
@@ -47,6 +47,9 @@
         <listitem>
           <para>[William Harrington] - Remove Binutils 2.22 branch update patch.</para> 
         </listitem>
+        <listitem>
+          <para>[William Harrington] - Modify coreutils temp system build.</para> 
+        </listitem>
       </itemizedlist>
     </listitem>
 

-----------------------------------------------------------------------

Summary of changes:
 BOOK/introduction/common/changelog.xml  |    3 +++
 BOOK/temp-system/common/coreutils.xml   |   14 ++++++++++++++
 BOOK/temp-system/multilib/coreutils.xml |   22 ++++++++++++++++++++++
 3 files changed, 39 insertions(+), 0 deletions(-)


hooks/post-receive
-- 
Cross-LFS Book



More information about the Clfs-commits mailing list