diff options
| author | Timothy Bauscher <timothy@linuxfromscratch.org> | 2002-09-29 19:48:03 +0000 |
|---|---|---|
| committer | Timothy Bauscher <timothy@linuxfromscratch.org> | 2002-09-29 19:48:03 +0000 |
| commit | b8e6552e6f3ce3c32a83a332171e0b821f6aef2a (patch) | |
| tree | 37763c3a60ba19f6b404fd21f0f5cb0a3ae48bb1 | |
| parent | 4a19a8d141f1a47ca28a9f9cae3b555c091d5338 (diff) | |
Replaced nofixincludes patch (it doesn't apply cleanly) with a (more appropriate) sed command.
git-svn-id: http://svn.linuxfromscratch.org/LFS/trunk/BOOK@2152 4aa44e1e-78dd-0310-a6d2-fbcd4c07a689
| -rw-r--r-- | chapter01/changelog.xml | 4 | ||||
| -rw-r--r-- | chapter04/gcc-patch.xml | 4 | ||||
| -rw-r--r-- | chapter05/gcc-exp.xml | 4 | ||||
| -rw-r--r-- | chapter05/gcc-inst.xml | 3 |
4 files changed, 8 insertions, 7 deletions
diff --git a/chapter01/changelog.xml b/chapter01/changelog.xml index 1b9fa7e59..d9d468398 100644 --- a/chapter01/changelog.xml +++ b/chapter01/changelog.xml @@ -61,6 +61,10 @@ </itemizedlist> </para></listitem> +<listitem><para>September 29th, 2002 [timothy]: Chapter 05 - GCC: Replaced +the nofixincludes patch (because it doesn't apply cleanly) with a sed +command.</para></listitem> + <listitem><para>September 28th, 2002 [gerard]: Chapter 05 - GCC: Added the nofixincludes patch to prevent that script from running in Chapter 05. It should run in Chapter 06, so we need it to be a seperate diff --git a/chapter04/gcc-patch.xml b/chapter04/gcc-patch.xml index b1b7d2779..f93b6248e 100644 --- a/chapter04/gcc-patch.xml +++ b/chapter04/gcc-patch.xml @@ -1,7 +1,3 @@ GCC Patch (&gcc-patch-version;) - &gcc-patch-size;: <ulink url="&ftp;/gcc-&gcc-patch-version;.patch.bz2"/> <ulink url="&http;/gcc-&gcc-patch-version;.patch.bz2"/> - -GCC nofixincludes Patch: -<ulink url="&ftp;/gcc-&gcc-version;-nofixincludes.patch.bz2"/> -<ulink url="&http;/gcc-&gcc-version;-nofixincludes.patch.bz2"/> diff --git a/chapter05/gcc-exp.xml b/chapter05/gcc-exp.xml index c64f22f6c..ae6d923ac 100644 --- a/chapter05/gcc-exp.xml +++ b/chapter05/gcc-exp.xml @@ -6,8 +6,8 @@ This patch fixes a few bugs. In particular it contains the "copy fix" and "var fix" documented at <ulink url="http://www.zipworld.com.au/~gschafer/lfs-tweaks.html"/>.</para> -<para><userinput>patch -Np1 -i ../gcc-&gcc-version;-nofixincludes.patch:</userinput> -This patch prevents the fixincludes script from running.</para> +<para><userinput>sed '/$(SHELL) .\/fixinc.sh/d':</userinput> +This prevents the fixincludes script from running.</para> <para><userinput>--prefix=/static:</userinput> This is NOT a typo. GCC hard codes some paths while compiling and so we need to pass /static as the diff --git a/chapter05/gcc-inst.xml b/chapter05/gcc-inst.xml index 36662b95d..b09ee4cdb 100644 --- a/chapter05/gcc-inst.xml +++ b/chapter05/gcc-inst.xml @@ -15,7 +15,8 @@ been warned.</para> <para>Install GCC by running the following commands:</para> <para><screen><userinput>patch -Np1 -i ../gcc-&gcc-patch-version;.patch && -patch -Np1 -i ../gcc-&gcc-version;-nofixincludes.patch && +cp gcc/Makefile.in{,.backup} && +sed '/$(SHELL) .\/fixinc.sh/d' gcc/Makefile.in.backup > gcc/Makefile.in && mkdir ../gcc-build && cd ../gcc-build && ../gcc-&gcc-version;/configure --prefix=/static --enable-languages=c \ |