diff options
| author | Matthew Burgess <matthew@linuxfromscratch.org> | 2013-08-21 20:17:26 +0000 |
|---|---|---|
| committer | Matthew Burgess <matthew@linuxfromscratch.org> | 2013-08-21 20:17:26 +0000 |
| commit | 184ff2a7689b3c23e3ee4acae48ccde933804949 (patch) | |
| tree | 8c9a5106622304870283316feb3b5a0f5f50e39c | |
| parent | f5250e60888e217deba516370fca1389213a33b2 (diff) | |
Add a patch to fix an intermittent test failure in Automake.
git-svn-id: http://svn.linuxfromscratch.org/LFS/trunk/BOOK@10323 4aa44e1e-78dd-0310-a6d2-fbcd4c07a689
| -rw-r--r-- | chapter01/changelog.xml | 10 | ||||
| -rw-r--r-- | chapter01/whatsnew.xml | 4 | ||||
| -rw-r--r-- | chapter03/patches.xml | 8 | ||||
| -rw-r--r-- | chapter06/automake.xml | 8 | ||||
| -rw-r--r-- | patches.ent | 4 |
5 files changed, 31 insertions, 3 deletions
diff --git a/chapter01/changelog.xml b/chapter01/changelog.xml index e61395736..7a5f1d1b7 100644 --- a/chapter01/changelog.xml +++ b/chapter01/changelog.xml @@ -36,6 +36,16 @@ </listitem> --> <listitem> + <para>2013-08-21</para> + <itemizedlist> + <listitem> + <para>[matthew] - Add a patch to fix an intermittent test failure in + Automake.</para> + </listitem> + </itemizedlist> + </listitem> + + <listitem> <para>2013-08-15</para> <itemizedlist> <listitem> diff --git a/chapter01/whatsnew.xml b/chapter01/whatsnew.xml index db5324db7..69c621636 100644 --- a/chapter01/whatsnew.xml +++ b/chapter01/whatsnew.xml @@ -230,6 +230,10 @@ <listitem><para></para></listitem> <!-- satisfy build --> <listitem> + <para>&automake-test-patch;</para> + </listitem> + + <listitem> <para>bc &bc-version;</para> </listitem> diff --git a/chapter03/patches.xml b/chapter03/patches.xml index d65716c85..ce864f4d5 100644 --- a/chapter03/patches.xml +++ b/chapter03/patches.xml @@ -19,6 +19,14 @@ <variablelist role="materials"> <varlistentry> + <term>Automake Test Fix Patch - <token>&automake-test-patch-size;</token>:</term> + <listitem> + <para>Download: <ulink url="&patches-root;&automake-test-patch;"/></para> + <para>MD5 sum: <literal>&automake-test-patch-md5;</literal></para> + </listitem> + </varlistentry> + + <varlistentry> <term>Bash Upstream Fixes Patch - <token>&bash-fixes-patch-size;</token>:</term> <listitem> <para>Download: <ulink url="&patches-root;&bash-fixes-patch;"/></para> diff --git a/chapter06/automake.xml b/chapter06/automake.xml index 02f8022f2..bf48527a1 100644 --- a/chapter06/automake.xml +++ b/chapter06/automake.xml @@ -41,6 +41,10 @@ <sect2 role="installation"> <title>Installation of Automake</title> + <para>Fix an intermittent test failure:</para> + +<screen><userinput remap="pre">patch -Np1 -i ../&automake-test-patch;</userinput></screen> + <para>Prepare Automake for compilation:</para> <screen><userinput remap="configure">./configure --prefix=/usr --docdir=/usr/share/doc/automake-&automake-version;</userinput></screen> @@ -49,9 +53,7 @@ <screen><userinput remap="make">make</userinput></screen> - <note><para>The tests take a very long time: over 30 SBUs. Running - the tests is not recommended. At least one test (of over 3000) is - known to intermittently fail.</para></note> + <note><para>The tests take a very long time: over 30 SBUs.</para></note> <para>To test the results, issue:</para> diff --git a/patches.ent b/patches.ent index 553ebcf54..6d93cc6c3 100644 --- a/patches.ent +++ b/patches.ent @@ -2,6 +2,10 @@ <!-- Start of Common Patches --> +<!ENTITY automake-test-patch "automake-&automake-version;-test-1.patch"> +<!ENTITY automake-test-patch-md5 "1bc501443baee55bca4d6552ed18a757"> +<!ENTITY automake-test-patch-size "2.5 KB"> + <!ENTITY bash-fixes-patch "bash-&bash-version;-fixes-12.patch"> <!ENTITY bash-fixes-patch-md5 "419f95c173596aea47a23d922598977a"> <!ENTITY bash-fixes-patch-size "56 KB"> |