Changeset ffbeb5f for chapter06/glibc.xml

Timestamp:

08/14/2017 10:28:28 PM (7 years ago)

Author:

Bruce Dubbs <bdubbs@…>

Branches:

10.0, 10.0-rc1, 10.1, 10.1-rc1, 11.0, 11.0-rc1, 11.0-rc2, 11.0-rc3, 11.1, 11.1-rc1, 11.2, 11.2-rc1, 11.3, 11.3-rc1, 12.0, 12.0-rc1, 12.1, 12.1-rc1, 8.1, 8.2, 8.3, 8.4, 9.0, 9.1, arm, bdubbs/gcc13, ml-11.0, multilib, renodr/libudev-from-systemd, s6-init, trunk, xry111/arm64, xry111/arm64-12.0, xry111/clfs-ng, xry111/lfs-next, xry111/loongarch, xry111/loongarch-12.0, xry111/loongarch-12.1, xry111/mips64el, xry111/pip3, xry111/rust-wip-20221008, xry111/update-glibc

Children:

f35e98c

Parents:

b485746

Message:

Update to gcc-7.2.0.
Update to linux-4.12.7.
Update to glibc-2.26.
Update to dbus-1.10.22.
Update to binutils-2.29.

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

File:

• chapter06/glibc.xml (modified) (2 diffs)

chapter06/glibc.xml

@@ -69 +69 @@
 <screen><userinput remap="pre">case $(uname -m) in
     i?86)    GCC_INCDIR=/usr/lib/gcc/$(uname -m)-pc-linux-gnu/&gcc-version;/include
-            ln -s ld-linux.so.2 /lib/ld-lsb.so.3
+            ln -sfv ld-linux.so.2 /lib/ld-lsb.so.3
     ;;
     x86_64) GCC_INCDIR=/usr/lib/gcc/x86_64-pc-linux-gnu/&gcc-version;/include
-            ln -s ../lib/ld-linux-x86-64.so.2 /lib64
-            ln -s ../lib/ld-linux-x86-64.so.2 /lib64/ld-lsb-x86-64.so.3
+            ln -sfv ../lib/ld-linux-x86-64.so.2 /lib64
+            ln -sfv ../lib/ld-linux-x86-64.so.2 /lib64/ld-lsb-x86-64.so.3
     ;;
 esac</userinput></screen>
+
+    <para>Remove a file that may be left over from a previous build attempt:
+    </para>
+
+<screen><userinput remap="pre">rm -f /usr/include/limits.h</userinput></screen>
 
     <para>The Glibc documentation recommends building Glibc 
@@ -198 +203 @@
 
 <screen><userinput remap="install">touch /etc/ld.so.conf</userinput></screen>
+
+    <para>Fix the generated Makefile to skip an uneeded sanity check
+    that fails in the LFS partial environment:
+    </para>
+
+<screen><userinput remap="install">sed '/test-installation/s@$(PERL)@echo not running@' -i ../Makefile</userinput></screen>
 
     <para>Install the package:</para>