aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMatthew Burgess <matthew@linuxfromscratch.org>2012-07-13 19:56:44 +0000
committerMatthew Burgess <matthew@linuxfromscratch.org>2012-07-13 19:56:44 +0000
commit8c4af267f5b405d61af83e978d3eb8c835b85258 (patch)
treee88129db02b3d57c6967f4ee3cddc64198aa1089
parent4aff39624681ad351a5f09e4f462aa53eafff828 (diff)
Upgrade to Automake-1.12.2. Fixes #3134.
git-svn-id: http://svn.linuxfromscratch.org/LFS/trunk/BOOK@9904 4aa44e1e-78dd-0310-a6d2-fbcd4c07a689
-rw-r--r--chapter01/changelog.xml4
-rw-r--r--chapter06/automake.xml5
-rw-r--r--packages.ent6
3 files changed, 12 insertions, 3 deletions
diff --git a/chapter01/changelog.xml b/chapter01/changelog.xml
index 638a06e1d..05ec87976 100644
--- a/chapter01/changelog.xml
+++ b/chapter01/changelog.xml
@@ -41,6 +41,10 @@
<para>2012-07-13</para>
<itemizedlist>
<listitem>
+ <para>[matthew] - Upgrade to Automake-1.12.2. Fixes
+ <ulink url="&lfs-ticket-root;3134">#3134</ulink>.</para>
+ </listitem>
+ <listitem>
<para>[matthew] - Upgrade to MPFR-3.1.1. Fixes
<ulink url="&lfs-ticket-root;3133">#3133</ulink>.</para>
</listitem>
diff --git a/chapter06/automake.xml b/chapter06/automake.xml
index 53ea72496..925d4d39e 100644
--- a/chapter06/automake.xml
+++ b/chapter06/automake.xml
@@ -41,6 +41,11 @@
<sect2 role="installation">
<title>Installation of Automake</title>
+ <para>Fix a bug in the testsuite that can cause one of the tests to fail
+ intermittently:</para>
+
+<screen><userinput remap="pre">sed -i -e '/$ACLOCAL/i$sleep' t/aclocal7.sh</userinput></screen>
+
<para>Prepare Automake for compilation:</para>
<screen><userinput remap="configure">./configure --prefix=/usr --docdir=/usr/share/doc/automake-&automake-version;</userinput></screen>
diff --git a/packages.ent b/packages.ent
index f1fdb2be1..70c837618 100644
--- a/packages.ent
+++ b/packages.ent
@@ -15,11 +15,11 @@
<!ENTITY autoconf-ch6-du "12.4 MB">
<!ENTITY autoconf-ch6-sbu "4.8 SBU">
-<!ENTITY automake-version "1.12.1">
+<!ENTITY automake-version "1.12.2">
<!ENTITY am-minor-version "1.12">
-<!ENTITY automake-size "1,321 KB">
+<!ENTITY automake-size "1,336 KB">
<!ENTITY automake-url "&gnu;automake/automake-&automake-version;.tar.xz">
-<!ENTITY automake-md5 "036d79de6e443e02aec2be1df2b4f0ac">
+<!ENTITY automake-md5 "56c3ab38a5ed8f2b825341b4e007372a">
<!ENTITY automake-home "&gnu-software;automake/">
<!ENTITY automake-ch6-du "28.8 MB">
<!ENTITY automake-ch6-sbu "less than 0.1 SBU (without tests)">