aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBruce Dubbs <bdubbs@linuxfromscratch.org>2012-08-20 19:01:25 +0000
committerBruce Dubbs <bdubbs@linuxfromscratch.org>2012-08-20 19:01:25 +0000
commit25d78ecbd764173db754061abeb275f33f3e35ed (patch)
tree511798d47b035e0ba14bd778119f9616a8393dc4
parent3f99c28d74c982ff69062cf16f879ad11cd6637a (diff)
Add flex patch to fix regression suite errors.
Add PATH to su invocations to ensure /tools/bin is included git-svn-id: http://svn.linuxfromscratch.org/LFS/trunk/BOOK@9943 4aa44e1e-78dd-0310-a6d2-fbcd4c07a689
-rw-r--r--chapter01/changelog.xml10
-rw-r--r--chapter01/whatsnew.xml4
-rw-r--r--chapter03/patches.xml8
-rw-r--r--chapter06/bash.xml2
-rw-r--r--chapter06/coreutils.xml2
-rw-r--r--chapter06/flex.xml4
-rw-r--r--patches.ent3
7 files changed, 31 insertions, 2 deletions
diff --git a/chapter01/changelog.xml b/chapter01/changelog.xml
index 1bcc7a2f5..02f775344 100644
--- a/chapter01/changelog.xml
+++ b/chapter01/changelog.xml
@@ -38,6 +38,16 @@
-->
<listitem>
+ <para>2012-08-20</para>
+ <itemizedlist>
+ <listitem>
+ <para>[bdubbs] - Add patch to fix Flex regression test
+ failures.</para>
+ </listitem>
+ </itemizedlist>
+ </listitem>
+
+ <listitem>
<para>2012-08-15</para>
<itemizedlist>
<listitem>
diff --git a/chapter01/whatsnew.xml b/chapter01/whatsnew.xml
index 164d6363a..ee6802b48 100644
--- a/chapter01/whatsnew.xml
+++ b/chapter01/whatsnew.xml
@@ -232,6 +232,10 @@
</listitem>
<listitem>
+ <para>&flex-bison-patch;</para>
+ </listitem>
+
+ <listitem>
<para>&kbd-fixes-patch;</para>
</listitem>
diff --git a/chapter03/patches.xml b/chapter03/patches.xml
index 5f09532ea..cf7f52490 100644
--- a/chapter03/patches.xml
+++ b/chapter03/patches.xml
@@ -50,6 +50,14 @@
</listitem>
</varlistentry>
+ <varlistentry>
+ <term>Flex Regression Tests Patch - <token>&flex-bison-patch-size;</token>:</term>
+ <listitem>
+ <para>Download: <ulink url="&patches-root;&flex-bison-patch;"/></para>
+ <para>MD5 sum: <literal>&flex-bison-patch-md5;</literal></para>
+ </listitem>
+ </varlistentry>
+
<!--
<varlistentry>
<term>GRUB Disk Geometry Patch - <token>&grub-geometry-patch-size;</token>:</term>
diff --git a/chapter06/bash.xml b/chapter06/bash.xml
index 06db04163..571427627 100644
--- a/chapter06/bash.xml
+++ b/chapter06/bash.xml
@@ -89,7 +89,7 @@
<para>Now, run the tests as the <systemitem
class="username">nobody</systemitem> user:</para>
-<screen><userinput remap="test">su nobody -s /bin/bash -c "make tests"</userinput></screen>
+<screen><userinput remap="test">su nobody -s /bin/bash -c "PATH=$PATH make tests"</userinput></screen>
<para>Install the package:</para>
diff --git a/chapter06/coreutils.xml b/chapter06/coreutils.xml
index de033830f..1b0906cec 100644
--- a/chapter06/coreutils.xml
+++ b/chapter06/coreutils.xml
@@ -107,7 +107,7 @@
fail because the regression test has not been updated for the latest
time zone data.</para>
-<screen><userinput remap="test">su nobody -s /bin/bash -c "make RUN_EXPENSIVE_TESTS=yes -k check || true"</userinput></screen>
+<screen><userinput remap="test">su nobody -s /bin/bash -c "PATH=$PATH make RUN_EXPENSIVE_TESTS=yes -k check || true"</userinput></screen>
<para>Remove the temporary group:</para>
diff --git a/chapter06/flex.xml b/chapter06/flex.xml
index 9de4a189c..b1feaf6cd 100644
--- a/chapter06/flex.xml
+++ b/chapter06/flex.xml
@@ -41,6 +41,10 @@
<sect2 role="installation">
<title>Installation of Flex</title>
+ <para>First, fix some regression tests:</para>
+
+<screen><userinput remap="pre">patch -Np1 -i ../&flex-bison-patch;</userinput></screen>
+
<para>Prepare Flex for compilation:</para>
<screen><userinput remap="configure">./configure --prefix=/usr --mandir=/usr/share/man --infodir=/usr/share/info</userinput></screen>
diff --git a/patches.ent b/patches.ent
index a08d40d18..5d2453f19 100644
--- a/patches.ent
+++ b/patches.ent
@@ -26,6 +26,9 @@
<!ENTITY diffutils-i18n-patch-md5 "c8d481223db274a33b121fb8c25af9f7">
<!ENTITY diffutils-i18n-patch-size "18 KB">
+<!ENTITY flex-bison-patch "flex-&flex-version;-bison-2.6.1-1.patch">
+<!ENTITY flex-bison-patch-md5 "d5b001ef9bdbbe32e2f27576d97d8ff0">
+<!ENTITY flex-bison-patch-size "2.8 KB">
<!ENTITY gcc-startfiles-patch "gcc-&gcc-version;-startfiles_fix-1.patch">
<!ENTITY gcc-startfiles-patch-md5 "799ef1971350d2e3c794f2123f247cc6">