From f32421a3b98697ad4eac02f82fa5da008bb62565 Mon Sep 17 00:00:00 2001 From: Matthew Burgess Date: Sat, 23 May 2009 09:43:32 +0000 Subject: Shorten the linker adjustment command in chapter 6. Fixes #2404. git-svn-id: http://svn.linuxfromscratch.org/LFS/trunk/BOOK@8900 4aa44e1e-78dd-0310-a6d2-fbcd4c07a689 --- chapter01/changelog.xml | 5 +++++ chapter06/glibc.xml | 3 +-- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/chapter01/changelog.xml b/chapter01/changelog.xml index cceca8b81..841f7b084 100644 --- a/chapter01/changelog.xml +++ b/chapter01/changelog.xml @@ -40,6 +40,11 @@ 2009-05-23 + + [matthew] - Shorten the command used to adjust the linker in + Chapter 6. Thanks to Chris Staub for the improvement. Fixes + #2404. + [matthew] - Upgrade to Shadow-4.1.4.1. Fixes #2408. diff --git a/chapter06/glibc.xml b/chapter06/glibc.xml index 4dc69b9a7..53c97a8ca 100644 --- a/chapter06/glibc.xml +++ b/chapter06/glibc.xml @@ -84,8 +84,7 @@ mv glibc-libidn-&glibc-version; libidn test would be carried out against the wrong Glibc. We can force the script to check the Glibc we have just installed with the following: -DL=$(readelf -l /bin/sh | grep interpreter | \ -awk '{print $4}' | sed -e 's@/tools@@' -e 's@]$@@') +DL=$(readelf -l /bin/sh | sed -n 's@.*interpret.*/tools\(.*\)]$@\1@p') sed -i "s|libs -o|libs -L/usr/lib -Wl,-dynamic-linker=$DL -o|" \ scripts/test-installation.pl unset DL -- cgit v1.2.3-54-g00ecf