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
This commit is contained in:
Zack Winkles 2004-06-11 15:49:18 +00:00
parent a66c1cd3b3
commit 0fa92755df
3 changed files with 17 additions and 7 deletions

View File

@ -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>

View File

@ -63,6 +63,13 @@ following:</para>
</listitem>
</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>

View File

@ -34,16 +34,15 @@ 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>patch -Np1 -i ../grub-&grub-version;-gcc34-1.patch</userinput></screen>
<para>Prepare Grub for compilation:</para>
<screen><userinput>./configure --prefix=/usr</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>
<screen><userinput>make -C stage2 STAGE2_CFLAGS=-O2 \
pre_stage2_exec-builtins.o pre_stage2_exec-serial.o</userinput></screen>
<para>Now compile the rest of the package:</para>
<screen><userinput>make</userinput></screen>