aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMatthew Burgess <matthew@linuxfromscratch.org>2012-04-29 11:30:57 +0000
committerMatthew Burgess <matthew@linuxfromscratch.org>2012-04-29 11:30:57 +0000
commit0ba6d531b4f499fa506c807f41ca5d26355333af (patch)
treefa19aa77f1fae6b904f2ee2773bbce7409e801e9
parentae0510ab1db8f11772c0f3a14551bf2734eee0fd (diff)
Upgrade to Automake-1.12. Fixes #3070.
git-svn-id: http://svn.linuxfromscratch.org/LFS/trunk/BOOK@9836 4aa44e1e-78dd-0310-a6d2-fbcd4c07a689
-rw-r--r--chapter01/changelog.xml4
-rw-r--r--chapter06/automake.xml5
-rw-r--r--packages.ent8
3 files changed, 13 insertions, 4 deletions
diff --git a/chapter01/changelog.xml b/chapter01/changelog.xml
index d31abc758..3cb9b9412 100644
--- a/chapter01/changelog.xml
+++ b/chapter01/changelog.xml
@@ -40,6 +40,10 @@
<para>2012-04-29</para>
<itemizedlist>
<listitem>
+ <para>[matthew] - Upgrade to Automake-1.12. Fixes
+ <ulink url="&lfs-ticket-root;3070">#3070</ulink>.</para>
+ </listitem>
+ <listitem>
<para>[matthew] - Upgrade to Grep-2.12. Fixes
<ulink url="&lfs-ticket-root;3068">#3068</ulink>.</para>
</listitem>
diff --git a/chapter06/automake.xml b/chapter06/automake.xml
index 109da7059..9458c6647 100644
--- a/chapter06/automake.xml
+++ b/chapter06/automake.xml
@@ -49,6 +49,11 @@
<screen><userinput remap="make">make</userinput></screen>
+ <para>Fix a couple of minor bugs in the test suite:</para>
+
+<screen><userinput remap="pre">sed -i -e "s/yacc/lex/" t/lex-clean.sh
+sed -i -e "s/cc/'non-root cc'/" t/dist-readonly.sh</userinput></screen>
+
<para>To test the results, issue:</para>
<screen><userinput remap="test">make check</userinput></screen>
diff --git a/packages.ent b/packages.ent
index f7f83cce7..2e1746b03 100644
--- a/packages.ent
+++ b/packages.ent
@@ -16,11 +16,11 @@
<!ENTITY autoconf-ch6-du "12.4 MB">
<!ENTITY autoconf-ch6-sbu "4.8 SBU">
-<!ENTITY automake-version "1.11.5">
-<!ENTITY am-minor-version "1.11">
-<!ENTITY automake-size "1,067 KB">
+<!ENTITY automake-version "1.12">
+<!ENTITY am-minor-version "1.12">
+<!ENTITY automake-size "1,300 KB">
<!ENTITY automake-url "&gnu;automake/automake-&automake-version;.tar.xz">
-<!ENTITY automake-md5 "13f6a9522339ac0885110506cb7abad8">
+<!ENTITY automake-md5 "5fc40c032ceaebecd1588b8d125b4781">
<!ENTITY automake-home "&gnu-software;automake/">
<!ENTITY automake-ch6-du "28.8 MB">
<!ENTITY automake-ch6-sbu "18.3 SBU">