Changeset a3af16f for chapter05/glibc.xml

Timestamp:

10/21/2013 08:43:55 PM (11 years ago)

Author:

Matthew Burgess <matthew@…>

Branches:

7.5-systemd, 7.6-systemd, 7.7-systemd, 7.8-systemd, 7.9-systemd

Children:

f2a5108

Parents:

c34291a

Message:

Merge latest trunk updates to systemd branch

git-svn-id: ​http://svn.linuxfromscratch.org/LFS/branches/systemd/BOOK@10365 4aa44e1e-78dd-0310-a6d2-fbcd4c07a689

File:

• chapter05/glibc.xml (modified) (4 diffs)

chapter05/glibc.xml

@@ -52 +52 @@
   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>Allow Glibc to be built using Make-&make-version;:</para>
+
+<screen><userinput remap="pre">sed -r -i 's/(3..89..)/\1 | 4.*/' configure</userinput></screen>
 
     <para>The Glibc documentation recommends building Glibc outside of the source
@@ -81 +89 @@
       --build=$(../glibc-&glibc-version;/scripts/config.guess) \
       --disable-profile                             \
-      --enable-kernel=2.6.25                        \
+      --enable-kernel=&min-kernel;                        \
       --with-headers=/tools/include                 \
       libc_cv_forced_unwind=yes                     \
@@ -108 +116 @@
 
       <varlistentry>
-        <term><parameter>--enable-kernel=2.6.25</parameter></term>
+        <term><parameter>--enable-kernel=&min-kernel;</parameter></term>
         <listitem>
           <para>This tells Glibc to compile the library with support
-          for 2.6.25 and later Linux kernels.  Workarounds for older
+          for &min-kernel; and later Linux kernels.  Workarounds for older
           kernels are not enabled.</para>
         </listitem>
@@ -221 +229 @@
   </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>