aboutsummaryrefslogtreecommitdiffstats
path: root/chapter05/glibc.xml
diff options
context:
space:
mode:
authorMatthew Burgess <matthew@linuxfromscratch.org>2012-03-26 20:29:25 +0000
committerMatthew Burgess <matthew@linuxfromscratch.org>2012-03-26 20:29:25 +0000
commit0c0d7c18125f1335cb5e52167a57c171b5b988cf (patch)
tree7016bd90022b62e18c0350173d0a6815e4355e98 /chapter05/glibc.xml
parentc8f104d30ae0613e67e4348c55bd4cd73271b8ee (diff)
Upgrade to Glibc-2.15. Fixes #3045.
git-svn-id: http://svn.linuxfromscratch.org/LFS/trunk/BOOK@9787 4aa44e1e-78dd-0310-a6d2-fbcd4c07a689
Diffstat (limited to 'chapter05/glibc.xml')
-rw-r--r--chapter05/glibc.xml19
1 files changed, 14 insertions, 5 deletions
diff --git a/chapter05/glibc.xml b/chapter05/glibc.xml
index 26db57d2d..1a95b0935 100644
--- a/chapter05/glibc.xml
+++ b/chapter05/glibc.xml
@@ -43,14 +43,14 @@
<sect2 role="installation">
<title>Installation of Glibc</title>
- <para>Fix a bug that prevents Glibc from building with GCC-&gcc-version;:</para>
+ <para>Address a header check that fails due to an incomplete build
+ environment at this point:</para>
- <screen><userinput remap="pre">patch -Np1 -i ../&glibc-gcc_fix-patch;</userinput></screen>
+ <screen><userinput remap="pre">sed -i 's#$ac_includes_default#\n\n#' sysdeps/i386/configure</userinput></screen>
- <para>Also address a header check that fails due to an incomplete build
- environment at this point:</para>
+ <para>Fix a path that is hardcoded:</para>
- <screen><userinput remap="pre">patch -Np1 -i ../&glibc-cpuid-patch;</userinput></screen>
+ <screen><userinput remap="pre">sed -i 's#/var/db#/tools/var/db#' Makeconfig</userinput></screen>
<para>The Glibc documentation recommends building Glibc outside of the source
directory in a dedicated build directory:</para>
@@ -83,6 +83,7 @@ esac</userinput></screen>
--enable-kernel=2.6.25 \
--with-headers=/tools/include \
libc_cv_forced_unwind=yes \
+ libc_cv_ctors_header=yes \
libc_cv_c_cleanup=yes</userinput></screen>
<variablelist>
@@ -151,6 +152,14 @@ esac</userinput></screen>
cleanup handling support is configured.</para>
</listitem>
</varlistentry>
+ <varlistentry>
+ <term><parameter>libc_cv_ctors_header=yes</parameter></term>
+ <listitem>
+ <para>Simlarly, we pass libc_cv_ctors_header=yes through to the
+ <command>configure</command> script so that the test is skipped and
+ gcc constructor support is configured.</para>
+ </listitem>
+ </varlistentry>
</variablelist>