From 0f344ddfa8541a3bad3f771188501494b8848079 Mon Sep 17 00:00:00 2001 From: Bruce Dubbs Date: Mon, 31 Dec 2012 19:36:41 +0000 Subject: [PATCH] Add patch to fix binutils test suite git-svn-id: http://svn.linuxfromscratch.org/LFS/trunk/BOOK@10087 4aa44e1e-78dd-0310-a6d2-fbcd4c07a689 --- chapter01/changelog.xml | 12 ++++++++++++ chapter01/whatsnew.xml | 4 ++++ chapter03/patches.xml | 8 ++++++++ chapter06/binutils.xml | 6 +++++- chapter06/e2fsprogs.xml | 11 +++++------ general.ent | 6 +++--- patches.ent | 9 +++------ 7 files changed, 40 insertions(+), 16 deletions(-) diff --git a/chapter01/changelog.xml b/chapter01/changelog.xml index 6e6bfbda7..fb04074e7 100644 --- a/chapter01/changelog.xml +++ b/chapter01/changelog.xml @@ -36,6 +36,18 @@ --> + + 2012-12-31 + + + [bdubbs] - Add patch to fix binutils test suite. + All binutils tests now pass, so remove the "-k" flag + from test invocation. + Thanks to Pierre Labastie for the patch. + + + + 2012-12-30 diff --git a/chapter01/whatsnew.xml b/chapter01/whatsnew.xml index 4073f7017..d5fa816de 100644 --- a/chapter01/whatsnew.xml +++ b/chapter01/whatsnew.xml @@ -232,6 +232,10 @@ &bash-fixes-patch; + + &binutils-testsuite-fixes-patch; + + &kbd-backspace-patch; diff --git a/chapter03/patches.xml b/chapter03/patches.xml index 9afbcec14..a43018f97 100644 --- a/chapter03/patches.xml +++ b/chapter03/patches.xml @@ -26,6 +26,14 @@ + + Binutils Test Suite Patch - &binutils-testsuite-fixes-patch-size;: + + Download: + MD5 sum: &binutils-testsuite-fixes-patch-md5; + + + Bzip2 Documentation Patch - &bzip2-docs-patch-size;: diff --git a/chapter06/binutils.xml b/chapter06/binutils.xml index 44e8e4cba..0cca873ef 100644 --- a/chapter06/binutils.xml +++ b/chapter06/binutils.xml @@ -64,6 +64,10 @@ Ask your system administrator to create more. rm -fv etc/standards.info sed -i.bak '/^INFO/s/standards.info //' etc/Makefile.in + Fix some test suite scripts so all tests pass: + +patch -Np1 -i ../&binutils-testsuite-fixes-patch; + The Binutils documentation recommends building Binutils outside of the source directory in a dedicated build directory: @@ -114,7 +118,7 @@ cd ../binutils-build Test the results: -make -k check +make check Install the package: diff --git a/chapter06/e2fsprogs.xml b/chapter06/e2fsprogs.xml index 1ebbe6a55..59a98e83b 100644 --- a/chapter06/e2fsprogs.xml +++ b/chapter06/e2fsprogs.xml @@ -115,12 +115,11 @@ cd build make check - One of the E2fsprogs tests will attempt to allocate 256 MB - of memory. If you do not have significantly more RAM than this, it - is recommended to enable sufficient swap space for the test. See - and - for details on creating and enabling - swap space. + One of the E2fsprogs tests will attempt to allocate 256 MB of memory. + If you do not have significantly more RAM than this, be sure to enable + sufficient swap space for the test. See and + for details on creating and enabling swap space. Install the binaries, documentation, and shared libraries: diff --git a/general.ent b/general.ent index c0450ca4a..44c412cdf 100644 --- a/general.ent +++ b/general.ent @@ -1,6 +1,6 @@ - - - + + + diff --git a/patches.ent b/patches.ent index 93395f110..569113b84 100644 --- a/patches.ent +++ b/patches.ent @@ -6,22 +6,22 @@ + + + - - - @@ -30,12 +30,10 @@ - - @@ -44,7 +42,6 @@ -