[Clfs-commits] [Cross-LFS]Cross-LFS Book branch, master, updated. clfs-2.0.0-296-g2ca606a

git git at cross-lfs.org
Mon Aug 19 14:07:54 PDT 2013


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  2ca606a0bf7be886492547589d4da5107b261dd4 (commit)
       via  988ad560e9cf17c244caa3c0264fd11ff8fdccdb (commit)
      from  db605a59b52e50cc58f70839474163d6bb6f5734 (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 2ca606a0bf7be886492547589d4da5107b261dd4
Author: William Harrington <kb0iic at berzerkula.org>
Date:   Mon Aug 19 16:07:49 2013 -0500

    Bison and Flex hardcode the m4 binary to /cross-tools/bin/m4 durin temp-system which is not what we want. Fix it so that it is m4 without a path so that the PATH determines which m4 binary will be ran.

diff --git a/BOOK/temp-system/common/bison.xml b/BOOK/temp-system/common/bison.xml
index 217587c..67fceb1 100644
--- a/BOOK/temp-system/common/bison.xml
+++ b/BOOK/temp-system/common/bison.xml
@@ -38,7 +38,7 @@ sed '/bison.help:/s/^/# /' Makefile.in.orig > Makefile.in</userinput></screen>
     href="../../final-system/common/bison.xml"
     xpointer="xpointer(//*[@os='a'])"/>
 
-<screen os="ca"><userinput>./configure --prefix=/tools \
+<screen os="ca"><userinput>M4=m4 ./configure --prefix=/tools \
     --build=${CLFS_HOST} --host=${CLFS_TARGET} \
     --cache-file=config.cache</userinput></screen>
 
diff --git a/BOOK/temp-system/common/flex.xml b/BOOK/temp-system/common/flex.xml
index c1bcd6a..6038dad 100644
--- a/BOOK/temp-system/common/flex.xml
+++ b/BOOK/temp-system/common/flex.xml
@@ -35,7 +35,7 @@ EOF</userinput></screen>
     href="../../final-system/common/flex.xml"
     xpointer="xpointer(//*[@os='a'])"/>
 
-<screen os="cb"><userinput>./configure --prefix=/tools \
+<screen os="cb"><userinput>M4=m4 ./configure --prefix=/tools \
     --build=${CLFS_HOST} --host=${CLFS_TARGET} \
     --cache-file=config.cache</userinput></screen>
 
diff --git a/BOOK/temp-system/multilib/bison.xml b/BOOK/temp-system/multilib/bison.xml
index 9708373..374bf0b 100644
--- a/BOOK/temp-system/multilib/bison.xml
+++ b/BOOK/temp-system/multilib/bison.xml
@@ -42,7 +42,7 @@
     href="../../final-system/common/bison.xml"
     xpointer="xpointer(//*[@os='a'])"/>
 
-<screen os="ca"><userinput>CC="${CC} ${BUILD64}" ./configure --prefix=/tools \
+<screen os="ca"><userinput>CC="${CC} ${BUILD64}" M4=m4 ./configure --prefix=/tools \
     --build=${CLFS_HOST} --host=${CLFS_TARGET} \
     --cache-file=config.cache</userinput></screen>
 
diff --git a/BOOK/temp-system/multilib/flex.xml b/BOOK/temp-system/multilib/flex.xml
index 0818772..a49bd51 100644
--- a/BOOK/temp-system/multilib/flex.xml
+++ b/BOOK/temp-system/multilib/flex.xml
@@ -34,7 +34,7 @@
     href="../../final-system/common/flex.xml"
     xpointer="xpointer(//*[@os='a'])"/>
 
-<screen os="cb"><userinput>CC="${CC} ${BUILD64}" ./configure --prefix=/tools \
+<screen os="cb"><userinput>CC="${CC} ${BUILD64}" M4=m4 ./configure --prefix=/tools \
     --build=${CLFS_HOST} --host=${CLFS_TARGET} \
     --cache-file=config.cache</userinput></screen>
 

commit 988ad560e9cf17c244caa3c0264fd11ff8fdccdb
Author: William Harrington <kb0iic at berzerkula.org>
Date:   Mon Aug 19 16:06:43 2013 -0500

    Add M4=m4 entry for bison and flex to master changelog.

diff --git a/BOOK/introduction/common/changelog.xml b/BOOK/introduction/common/changelog.xml
index 6de139b..17a6925 100644
--- a/BOOK/introduction/common/changelog.xml
+++ b/BOOK/introduction/common/changelog.xml
@@ -39,8 +39,11 @@
       <para>19 August 2013</para>
       <itemizedlist>
         <listitem>
-          <para>[William Harrington] - Add missing <command>make mrproper</command> to final-system linux headers install..</para>
+          <para>[William Harrington] - Add missing <command>make mrproper</command> to final-system linux headers install.</para>
         </listitem>
+        <listitem>
+          <para>[William Harrington] - Add M4=m4 to temp system configure commands of Bison and Flex as M4 is hardcoded to /cross-tools.</para>
+        </listitem> 
       </itemizedlist>
     </listitem>
 

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

Summary of changes:
 BOOK/introduction/common/changelog.xml |    5 ++++-
 BOOK/temp-system/common/bison.xml      |    2 +-
 BOOK/temp-system/common/flex.xml       |    2 +-
 BOOK/temp-system/multilib/bison.xml    |    2 +-
 BOOK/temp-system/multilib/flex.xml     |    2 +-
 5 files changed, 8 insertions(+), 5 deletions(-)


hooks/post-receive
-- 
Cross-LFS Book



More information about the Clfs-commits mailing list