diff options
| author | Zack Winkles <winkie@linuxfromscratch.org> | 2004-06-11 15:49:18 +0000 |
|---|---|---|
| committer | Zack Winkles <winkie@linuxfromscratch.org> | 2004-06-11 15:49:18 +0000 |
| commit | 0fa92755df1e4e47e060b71c701adafb4160c2da (patch) | |
| tree | fe3d18ac8dab504c330d9743b6260e37ea67ed65 | |
| parent | a66c1cd3b356fa2fda06c8d1dda95561015ba20e (diff) | |
Dropped GRUB hack in favor of the real upstream fix
git-svn-id: http://svn.linuxfromscratch.org/LFS/trunk/BOOK@3776 4aa44e1e-78dd-0310-a6d2-fbcd4c07a689
| -rw-r--r-- | chapter01/changelog.xml | 4 | ||||
| -rw-r--r-- | chapter03/patches.xml | 7 | ||||
| -rw-r--r-- | chapter06/grub.xml | 11 |
3 files changed, 16 insertions, 6 deletions
diff --git a/chapter01/changelog.xml b/chapter01/changelog.xml index 73a0dc474..d64b2d12a 100644 --- a/chapter01/changelog.xml +++ b/chapter01/changelog.xml @@ -59,6 +59,7 @@ first a summary, then a detailed log.</para> <itemizedlist> <listitem><para>coreutils-5.2.1-suppress_hostname_uptime_kill_su-1.patch</para></listitem> <listitem><para>flex-2.5.31-debian_fixes-2.patch</para></listitem> +<listitem><para>grub-0.94-gcc34-1.patch</para></listitem> <listitem><para>hotplug-2004_04_01</para></listitem> <listitem><para>hotplug-2004_04_01-bogus_deps-1.patch</para></listitem> <listitem><para>hotplug-2004_04_01-device-2.patch</para></listitem> @@ -106,6 +107,9 @@ first a summary, then a detailed log.</para> </itemizedlist> </listitem> +<listitem><para>June 11, 2004 [winkie]: Dropped hackish GRUB instructions in +favor of a patch from upstream.</para></listitem> + <listitem><para>June 11, 2004 [winkie]: Force Readline to link against Ncurses. </para></listitem> diff --git a/chapter03/patches.xml b/chapter03/patches.xml index eb1cfd81c..d8b37d39e 100644 --- a/chapter03/patches.xml +++ b/chapter03/patches.xml @@ -64,6 +64,13 @@ following:</para> </varlistentry> <varlistentry> +<term>GRUB GCC 3.4 Compatibility Patch - 1 KB:</term> +<listitem> +<para><ulink url="&patches-root;grub-&grub-version;-gcc34-1.patch"/></para> +</listitem> +</varlistentry> + +<varlistentry> <term>Hotplug Bogus Dependencies Patch- 1 KB:</term> <listitem> <para><ulink url="&patches-root;hotplug-&hotplug-version;-bogus_deps-1.patch"/></para> diff --git a/chapter06/grub.xml b/chapter06/grub.xml index 6b23a5cd5..e7175e231 100644 --- a/chapter06/grub.xml +++ b/chapter06/grub.xml @@ -34,15 +34,14 @@ have defined any environment variables that override default optimizations, such as CFLAGS and CXXFLAGS, we recommend un-setting them when building Grub.</para> -<para>First prepare Grub for compilation:</para> +<para>This package also has issues with being compiled by GCC 3.4, which we +fix by applying the following patch:</para> -<screen><userinput>./configure --prefix=/usr</userinput></screen> +<screen><userinput>patch -Np1 -i ../grub-&grub-version;-gcc34-1.patch</userinput></screen> -<para>A few of the files comprising Grub have issues with optimizations done -by GCC 3.4. Compile these few files with known-good optimizations:</para> +<para>Prepare Grub for compilation:</para> -<screen><userinput>make -C stage2 STAGE2_CFLAGS=-O2 \ - pre_stage2_exec-builtins.o pre_stage2_exec-serial.o</userinput></screen> +<screen><userinput>./configure --prefix=/usr</userinput></screen> <para>Now compile the rest of the package:</para> |