diff --git a/chapter01/changelog.xml b/chapter01/changelog.xml index 6dabdd7be..4609ba33a 100644 --- a/chapter01/changelog.xml +++ b/chapter01/changelog.xml @@ -39,6 +39,14 @@ 2007-09-15 + + [jhuntwork] - Upgrade to Glibc-2.6.1. Fixes + #2018. + Thanks to Matthew Burgess for preparing a discrete patch, + Robert Connolly and Dan Nicholson for investigating how best + to adjust CFLAGS, and Greg Schafer for showing the technical + benefits of using CFLAGS with Glibc. + [jhuntwork] - Upgrade to GCC-4.2.1. Fixes #2002. diff --git a/chapter01/whatsnew.xml b/chapter01/whatsnew.xml index e8c63c12c..ceb7be18c 100644 --- a/chapter01/whatsnew.xml +++ b/chapter01/whatsnew.xml @@ -83,9 +83,9 @@ - + diff --git a/chapter05/coreutils.xml b/chapter05/coreutils.xml index 8d367b1ba..e52e60d85 100644 --- a/chapter05/coreutils.xml +++ b/chapter05/coreutils.xml @@ -43,6 +43,15 @@ Installation of Coreutils + The version of the function futimens used + by Coreutils is incompatible with the version that current + Glibc provides, so we'll rename the function: + +for file in src/{copy,touch}.c lib/utimens.{c,h} ; do \ + cp -v $file{,.orig} + sed 's/futimens/gl_&/' $file.orig > $file +done + Prepare Coreutils for compilation: ./configure --prefix=/tools diff --git a/chapter05/glibc.xml b/chapter05/glibc.xml index 0710ea5da..dd35ef1d3 100644 --- a/chapter05/glibc.xml +++ b/chapter05/glibc.xml @@ -49,6 +49,16 @@ mkdir -v ../glibc-build cd ../glibc-build + Because Glibc no longer supports i386, its developers say to use the + compiler flag -march=i486 when building it for x86 + machines. There are several ways to accomplish that, but testing shows that + the flag is best placed inside the build variable CFLAGS. + Instead of overriding completely what Glibc's internal build system uses + for CFLAGS, append the new flag to the existing contents of CFLAGS by + making use of the special file configparms: + +echo "CFLAGS += -march=i486" > configparms + Next, prepare Glibc for compilation: ../glibc-&glibc-version;/configure --prefix=/tools \ diff --git a/chapter05/gzip.xml b/chapter05/gzip.xml index a75659e2e..eb2c6a7c8 100644 --- a/chapter05/gzip.xml +++ b/chapter05/gzip.xml @@ -43,6 +43,15 @@ Installation of Gzip + The version of the function futimens used + by Gzip is incompatible with the version that current + Glibc provides, so we'll rename the function: + +for file in gzip.c lib/utimens.{c,h} ; do \ + cp -v $file{,.orig} + sed 's/futimens/gl_&/' $file.orig > $file +done + Prepare Gzip for compilation: ./configure --prefix=/tools diff --git a/chapter06/coreutils.xml b/chapter06/coreutils.xml index 3b4a0318e..82693d20c 100644 --- a/chapter06/coreutils.xml +++ b/chapter06/coreutils.xml @@ -41,6 +41,12 @@ Installation of Coreutils + The version of the function futimens used + by Coreutils is incompatible with the version that current + Glibc provides, so we'll rename the function: + +sed -i 's/futimens/gl_&/' src/{copy,touch}.c lib/utimens.{c,h} + A known issue with the uname program from this package is that the -p switch always returns unknown. The following patch diff --git a/chapter06/glibc.xml b/chapter06/glibc.xml index 93ca99aef..14860f6cf 100644 --- a/chapter06/glibc.xml +++ b/chapter06/glibc.xml @@ -102,6 +102,10 @@ mv glibc-libidn-&glibc-version; libidn mkdir -v ../glibc-build cd ../glibc-build + Again, add the needed compiler flag to CFLAGS: + +echo "CFLAGS += -march=i486" > configparms + Prepare Glibc for compilation: ../glibc-&glibc-version;/configure --prefix=/usr \ diff --git a/chapter06/gzip.xml b/chapter06/gzip.xml index 4f46665a2..e4eb2c394 100644 --- a/chapter06/gzip.xml +++ b/chapter06/gzip.xml @@ -41,6 +41,12 @@ Installation of Gzip + The version of the function futimens used + by Gzip is incompatible with the version that current + Glibc provides, so we'll rename the function: + +sed -i 's/futimens/gl_&/' gzip.c lib/utimens.{c,h} + Prepare Gzip for compilation: ./configure --prefix=/usr --bindir=/bin diff --git a/packages.ent b/packages.ent index 99d1b743e..16e0e3617 100644 --- a/packages.ent +++ b/packages.ent @@ -190,19 +190,19 @@ - - + + - + - - - + + +