aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBruce Dubbs <bdubbs@linuxfromscratch.org>2013-08-29 02:11:12 +0000
committerBruce Dubbs <bdubbs@linuxfromscratch.org>2013-08-29 02:11:12 +0000
commitfee272fee8e45e3e8c3aec82d0ebbd95b95f1566 (patch)
treee4d902bd9a80776dd029aede6a9421a0f3376cc9
parent70cd9f32c7262973ff403182978a28195a352f37 (diff)
Create a test branchtest
git-svn-id: http://svn.linuxfromscratch.org/LFS/branches/test@10329 4aa44e1e-78dd-0310-a6d2-fbcd4c07a689
-rw-r--r--chapter05/glibc.xml12
-rw-r--r--chapter06/glibc.xml4
2 files changed, 12 insertions, 4 deletions
diff --git a/chapter05/glibc.xml b/chapter05/glibc.xml
index 94928996d..3eaf21932 100644
--- a/chapter05/glibc.xml
+++ b/chapter05/glibc.xml
@@ -52,6 +52,10 @@
su -c 'cp -v sunrpc/rpc/*.h /usr/include/rpc'
fi</userinput></screen>
+ <para>An upstream change needs to be reverted:</para>
+
+<screen><userinput remap="pre">sed -i -e 's/static __m128i/inline &amp;/' sysdeps/x86_64/multiarch/strstr.c</userinput></screen>
+
<para>The Glibc documentation recommends building Glibc outside of the source
directory in a dedicated build directory:</para>
@@ -220,10 +224,10 @@ readelf -l a.out | grep ': /tools'</userinput></screen>
</caution>
- <note><para>Building Binutils in the next section will serve as an additional check that
- the toolchain has been built properly. If Binutils fails to build, it is an
- indication that something has gone wrong with the previous Binutils, GCC, or Glibc
- installations.</para></note>
+ <note><para>Building Binutils in the section after next will serve as an
+ additional check that the toolchain has been built properly. If Binutils
+ fails to build, it is an indication that something has gone wrong with the
+ previous Binutils, GCC, or Glibc installations.</para></note>
</sect2>
diff --git a/chapter06/glibc.xml b/chapter06/glibc.xml
index 485f0d7d4..46f7b18b5 100644
--- a/chapter06/glibc.xml
+++ b/chapter06/glibc.xml
@@ -61,6 +61,10 @@
Glibc autoconf tests would give false results and defeat the goal
of achieving a clean build.</para>
+ <para>An upstream change needs to be reverted:</para>
+
+<screen><userinput remap="pre">sed -i -e 's/static __m128i/inline &amp;/' sysdeps/x86_64/multiarch/strstr.c</userinput></screen>
+
<para>The Glibc documentation recommends building Glibc outside of the source
directory in a dedicated build directory:</para>