Author: robert
Date: 2006-11-27 08:00:26 -0700 (Mon, 27 Nov 2006)
New Revision: 906
Modified:
branches/2.4-branch/BOOK/chapter01/changelog.xml
branches/2.4-branch/BOOK/chapter04/patches.xml
branches/2.4-branch/BOOK/chapter05/gcc-pass2.xml
branches/2.4-branch/BOOK/patches.ent
trunk/BOOK/chapter01/changelog.xml
trunk/BOOK/chapter04/patches.xml
trunk/BOOK/chapter05/cocoon-toolchain.xml
trunk/BOOK/chapter06/butterfly-toolchain.xml
trunk/BOOK/patches.ent
Log:
removed the gcc specs patch all together, to fix bug with binutils test suite
Modified: branches/2.4-branch/BOOK/chapter01/changelog.xml
===================================================================
--- branches/2.4-branch/BOOK/chapter01/changelog.xml 2006-11-27 13:56:19 UTC
(rev 905)
+++ branches/2.4-branch/BOOK/chapter01/changelog.xml 2006-11-27 15:00:26 UTC
(rev 906)
@@ -109,8 +109,8 @@
</listitem>
-->
-<listitem><para>November 27th, 2005 [Robert]: Added a new GCC specs_x86 patch
to resolve
-a bug in Binutils test suite.</para></listitem>
+<listitem><para>November 27th, 2005 [Robert]: Removed the gcc specs patch, and
use
+sed command instead, to resolve a bug in Binutils test suite.</para></listitem>
<listitem><para>November 27th, 2005 [Robert]: Added more notes about test suite
results in Glibc chap6.</para></listitem>
Modified: branches/2.4-branch/BOOK/chapter04/patches.xml
===================================================================
--- branches/2.4-branch/BOOK/chapter04/patches.xml 2006-11-27 13:56:19 UTC
(rev 905)
+++ branches/2.4-branch/BOOK/chapter04/patches.xml 2006-11-27 15:00:26 UTC
(rev 906)
@@ -130,14 +130,6 @@
</listitem>
</varlistentry>
- <varlistentry>
- <term>GCC Specs Patch - &gcc-specs_x86-patch-size;:</term>
- <listitem>
- <para>Download: <ulink
url="&patches-root;&gcc-specs_x86-patch;"/></para>
- <para>MD5 sum: <literal>&gcc-specs_x86-patch-md5;</literal></para>
- </listitem>
- </varlistentry>
-
<varlistentry condition="uclibc">
<term>GCC uClibc Configure Patch - &gcc-uClibc_conf-patch-size;:</term>
<listitem>
Modified: branches/2.4-branch/BOOK/chapter05/gcc-pass2.xml
===================================================================
--- branches/2.4-branch/BOOK/chapter05/gcc-pass2.xml 2006-11-27 13:56:19 UTC
(rev 905)
+++ branches/2.4-branch/BOOK/chapter05/gcc-pass2.xml 2006-11-27 15:00:26 UTC
(rev 906)
@@ -51,24 +51,27 @@
<screen><userinput>cp -v gcc/Makefile.in{,.orig} &&
sed '[EMAIL PROTECTED]/[EMAIL PROTECTED] true@' gcc/Makefile.in.orig >
gcc/Makefile.in</userinput></screen>
- <para>Apply the following patch to change the location of GCC's default
- dynamic linker (typically <filename
- class="libraryfile">ld-linux.so.2</filename>):</para>
+ <important>
+ <para>The following two commands are critical in ensuring a successful
+ build. Do not skip them.</para>
+ </important>
-<screen><userinput>patch -Np1 -i ../&gcc-specs_x86-patch;</userinput></screen>
+ <para>The next command adjusts the location of the default dynamic
+ linker so it points to <filename
class="directory">/tools</filename>:</para>
- <para>The above patch also removes <filename
- class="directory">/usr/include</filename> from GCC's include search path.
- Patching now rather than adjusting the specs file after installation
- ensures that the new dynamic linker is used during the actual build of
- GCC. That is, all of the binaries created during the build will link
- against the new Glibc.</para>
+<screen><userinput>cp -v gcc/config/i386/linux.h{,.orig}
+sed 's@/lib/ld-linux.so.2@/tools&@' \
+ gcc/config/i386/linux.h.orig >
gcc/config/i386/linux.h</userinput></screen>
- <important>
- <para>The above patch is critical in ensuring a successful overall
- build. Do not forget to apply it.</para>
- </important>
+ <para>The next command removes <filename
class="directory">/usr/include</filename>
+ from GCC's include search path. This ensures only our newly installed
+ headers, in <filename class="directory">/tools/usr/include</filename>,
+ are used.</para>
+<screen><userinput>cp -v gcc/config/linux.h{,.orig}
+echo "#undef STANDARD_INCLUDE_DIR
+#define STANDARD_INCLUDE_DIR 0" >>
gcc/config/linux.h</userinput></screen>
+
<para>Create a separate build directory again:</para>
<screen><userinput>mkdir -v ../gcc-build
@@ -83,8 +86,7 @@
--with-local-prefix=/tools --enable-clocale=gnu \
--enable-shared --enable-threads=posix \
--enable-__cxa_atexit --enable-languages=c,c++ \
- --disable-libstdcxx-pch --with-nostdinc \
- --with-dyn-linker=/tools/lib/ld-linux.so.2</userinput></screen>
+ --disable-libstdcxx-pch</userinput></screen>
<variablelist>
<title>The meaning of the new configure options:</title>
@@ -139,24 +141,6 @@
</listitem>
</varlistentry>
- <varlistentry>
-
<term><parameter>--with-dyn-linker=/tools/lib/ld-linux.so.2</parameter></term>
- <listitem>
- <para>This option tells GCC to link programs and libraries to
- <filename class="libraryfile">/tools/lib/ld-linux.so.2</filename>.
- This configure option is added by the specs patch.</para>
- </listitem>
- </varlistentry>
-
- <varlistentry>
- <term><parameter>--with-nostdinc</parameter></term>
- <listitem>
- <para>This option tells GCC not to hardcode include directories
- found on the host system, so only
- <filename class="directory">/tools/include</filename> will be
used.</para>
- </listitem>
- </varlistentry>
-
</variablelist>
<para>Compile the package:</para>
Modified: branches/2.4-branch/BOOK/patches.ent
===================================================================
--- branches/2.4-branch/BOOK/patches.ent 2006-11-27 13:56:19 UTC (rev
905)
+++ branches/2.4-branch/BOOK/patches.ent 2006-11-27 15:00:26 UTC (rev
906)
@@ -62,10 +62,6 @@
<!ENTITY gcc-linkonce-patch-md5 "828eba9c37954a678e9c421edde0589d">
<!ENTITY gcc-linkonce-patch-size "16 KB">
-<!ENTITY gcc-specs_x86-patch "gcc-&gcc-version;-specs_x86-2.patch">
-<!ENTITY gcc-specs_x86-patch-md5 "824cf913a77ed22e92071deb567e525d">
-<!ENTITY gcc-specs_x86-patch-size "8 KB">
-
<!ENTITY gcc-uClibc_conf-patch "gcc-&gcc-version;-uClibc_conf-1.patch">
<!ENTITY gcc-uClibc_conf-patch-md5 "86cd82e8d5ed062a8c1f273a4dfc9f60">
<!ENTITY gcc-uClibc_conf-patch-size "3.7 KB">
Modified: trunk/BOOK/chapter01/changelog.xml
===================================================================
--- trunk/BOOK/chapter01/changelog.xml 2006-11-27 13:56:19 UTC (rev 905)
+++ trunk/BOOK/chapter01/changelog.xml 2006-11-27 15:00:26 UTC (rev 906)
@@ -110,8 +110,8 @@
</listitem>
-->
-<listitem><para>November 27th, 2005 [Robert]: Added a new GCC specs_x86 patch
to resolve
-a bug in Binutils test suite.</para></listitem>
+<listitem><para>November 27th, 2005 [Robert]: Removed the gcc specs patch, and
use
+sed command instead, to resolve a bug in Binutils test suite.</para></listitem>
<listitem><para>November 26th, 2005 [Robert]: Moved mtab to
pwdgroup.xml.</para></listitem>
Modified: trunk/BOOK/chapter04/patches.xml
===================================================================
--- trunk/BOOK/chapter04/patches.xml 2006-11-27 13:56:19 UTC (rev 905)
+++ trunk/BOOK/chapter04/patches.xml 2006-11-27 15:00:26 UTC (rev 906)
@@ -122,14 +122,6 @@
</listitem>
</varlistentry>
- <varlistentry>
- <term>GCC Specs Patch - &gcc-specs_x86-patch-size;:</term>
- <listitem>
- <para>Download: <ulink
url="&patches-root;&gcc-specs_x86-patch;"/></para>
- <para>MD5 sum: <literal>&gcc-specs_x86-patch-md5;</literal></para>
- </listitem>
- </varlistentry>
-
<varlistentry condition="uclibc">
<term>GCC uClibc Configure Patch - &gcc-uClibc_conf-patch-size;:</term>
<listitem>
Modified: trunk/BOOK/chapter05/cocoon-toolchain.xml
===================================================================
--- trunk/BOOK/chapter05/cocoon-toolchain.xml 2006-11-27 13:56:19 UTC (rev
905)
+++ trunk/BOOK/chapter05/cocoon-toolchain.xml 2006-11-27 15:00:26 UTC (rev
906)
@@ -403,13 +403,27 @@
sed 's/^CRTSTUFF_CFLAGS =/& -fno-stack-protector/' \
gcc/Makefile.in.orig4 > gcc/Makefile.in</userinput></screen>
-<para>Apply the following patch to allow us to change the location of GCC's
-default dynamiclinker. This patch also adds the
-<parameter>--with-nostdinc</parameter> option, and points the SSP checking
-routines in <command>configure</command> to our new libc:</para>
+ <important>
+ <para>The following two commands are critical in ensuring a successful
+ build. Do not skip them.</para>
+ </important>
-<screen><userinput>patch -Np1 -i ../&gcc-specs_x86-patch;</userinput></screen>
+ <para>The next command adjusts the location of the default dynamic
+ linker so it points to <filename
class="directory">/tools</filename>:</para>
+<screen><userinput>cp -v gcc/config/i386/linux.h{,.orig}
+sed 's@/lib/ld-linux.so.2@/tools&@' \
+ gcc/config/i386/linux.h.orig >
gcc/config/i386/linux.h</userinput></screen>
+
+ <para>The next command removes <filename
class="directory">/usr/include</filename>
+ from GCC's include search path. This ensures only our newly installed
+ headers, in <filename class="directory">/tools/usr/include</filename>,
+ are used.</para>
+
+<screen><userinput>cp -v gcc/config/linux.h{,.orig}
+echo "#undef STANDARD_INCLUDE_DIR
+#define STANDARD_INCLUDE_DIR 0" >>
gcc/config/linux.h</userinput></screen>
+
<para>The GCC documentation recommends building outside of the source
directory in a dedicated build/object directory:</para>
@@ -422,7 +436,6 @@
--with-local-prefix=/tools --enable-shared \
--enable-clocale=<literal condition="glibc">gnu</literal><literal
condition="uclibc">uclibc</literal> --enable-threads=posix \
--enable-__cxa_atexit --enable-languages=c,c++ \
- --with-dyn-linker=/tools/lib/<literal
condition="glibc">ld-linux.so.2</literal><literal
condition="uclibc">ld-uClibc.so.0</literal> --with-nostdinc \
--with-lib-path=/tools/lib --disable-libstdcxx-pch \
--enable-checking --enable-werror-always</userinput></screen>
@@ -484,25 +497,6 @@
</varlistentry>
<varlistentry>
- <term><parameter>--with-dyn-linker</parameter></term>
- <listitem>
- <para>This option configures GCC to use our dynamic linker
- located in <filename class="directory">/tools/lib</filename>,
- rather than the dynamic linker in the host system.</para>
- </listitem>
- </varlistentry>
-
- <varlistentry>
- <term><parameter>--with-nostdinc</parameter></term>
- <listitem>
- <para>This option configures GCC not to look in
- <filename class="directory">/usr/include</filename> or
- <filename class="directory">/usr/local/include</filename>
- for header files. This option is provided by the specs patch.</para>
- </listitem>
- </varlistentry>
-
- <varlistentry>
<term><parameter>--with-lib-path=/tools/lib</parameter></term>
<listitem>
<para>This tells the configure script to specify the library
Modified: trunk/BOOK/chapter06/butterfly-toolchain.xml
===================================================================
--- trunk/BOOK/chapter06/butterfly-toolchain.xml 2006-11-27 13:56:19 UTC
(rev 905)
+++ trunk/BOOK/chapter06/butterfly-toolchain.xml 2006-11-27 15:00:26 UTC
(rev 906)
@@ -113,10 +113,6 @@
sed '0,/.*config.h can define.*/s//#include "hardened-specs.h"\n&/' \
-i.orig gcc/gcc.c</userinput></screen>
- <para>Apply the specs patch:</para>
-
-<screen><userinput>patch -Np1 -i ../&gcc-specs_x86-patch;</userinput></screen>
-
<para role="warnings">Disable the fixincludes script and -Werror
option:</para>
<screen role="warnings"><userinput>sed '[EMAIL PROTECTED]/[EMAIL PROTECTED]
true@' -i.orig2 gcc/Makefile.in
@@ -205,7 +201,6 @@
--libexecdir=/usr/lib --enable-shared \
--enable-threads=posix --enable-__cxa_atexit \
--enable-clocale=gnu --enable-languages=c,c++ \
- --with-dyn-linker=/lib/<literal
condition="glibc">ld-linux.so.2</literal><literal
condition="uclibc">ld-uClibc.so.0</literal> \
--enable-checking --enable-werror-always</userinput></screen>
<para>Compile the package:</para>
Modified: trunk/BOOK/patches.ent
===================================================================
--- trunk/BOOK/patches.ent 2006-11-27 13:56:19 UTC (rev 905)
+++ trunk/BOOK/patches.ent 2006-11-27 15:00:26 UTC (rev 906)
@@ -54,10 +54,6 @@
<!ENTITY gawk-segfault_fix-patch-md5 "7679530d88bf3eb56c42eb6aba342ddb">
<!ENTITY gawk-segfault_fix-patch-size "1.3 KB">
-<!ENTITY gcc-specs_x86-patch "gcc-&gcc-version;-specs_x86-3.patch">
-<!ENTITY gcc-specs_x86-patch-md5 "bcb69e920f90f0f3e9ba0e8386c9e776">
-<!ENTITY gcc-specs_x86-patch-size "8 KB">
-
<!ENTITY gcc-uClibc_conf-patch "gcc-&gcc-version;-uClibc_conf-1.patch">
<!ENTITY gcc-uClibc_conf-patch-md5 "86cd82e8d5ed062a8c1f273a4dfc9f60">
<!ENTITY gcc-uClibc_conf-patch-size "3.7 KB">
--
http://linuxfromscratch.org/mailman/listinfo/hlfs-book
FAQ: http://www.linuxfromscratch.org/faq/
Unsubscribe: See the above information page
