Changeset 0c0d7c1

Timestamp:

03/26/2012 08:29:25 PM (12 years ago)

Author:

Matthew Burgess <matthew@…>

Branches:

10.0, 10.0-rc1, 10.1, 10.1-rc1, 11.0, 11.0-rc1, 11.0-rc2, 11.0-rc3, 11.1, 11.1-rc1, 11.2, 11.2-rc1, 11.3, 11.3-rc1, 12.0, 12.0-rc1, 12.1, 12.1-rc1, 7.2, 7.3, 7.4, 7.5, 7.5-systemd, 7.6, 7.6-systemd, 7.7, 7.7-systemd, 7.8, 7.8-systemd, 7.9, 7.9-systemd, 8.0, 8.1, 8.2, 8.3, 8.4, 9.0, 9.1, arm, bdubbs/gcc13, ml-11.0, multilib, renodr/libudev-from-systemd, s6-init, trunk, xry111/arm64, xry111/arm64-12.0, xry111/clfs-ng, xry111/lfs-next, xry111/loongarch, xry111/loongarch-12.0, xry111/loongarch-12.1, xry111/mips64el, xry111/pip3, xry111/rust-wip-20221008, xry111/update-glibc

Children:

2a70ae8

Parents:

c8f104d

Message:

Upgrade to Glibc-2.15. Fixes #3045.

git-svn-id: ​http://svn.linuxfromscratch.org/LFS/trunk/BOOK@9787 4aa44e1e-78dd-0310-a6d2-fbcd4c07a689

Files:

• chapter01/changelog.xml (modified) (1 diff)
• chapter01/whatsnew.xml (modified) (2 diffs)
• chapter03/patches.xml (modified) (1 diff)
• chapter05/glibc.xml (modified) (3 diffs)
• chapter06/glibc.xml (modified) (1 diff)
• packages.ent (modified) (1 diff)
• patches.ent (modified) (1 diff)

chapter01/changelog.xml

@@ -40 +40 @@
       <para>2012-03-26</para>
       <itemizedlist>
+         <listitem>
+           <para>[matthew] - Upgrade to Glibc-2.15. Fixes
+           <ulink url="&lfs-ticket-root;3045">#3045</ulink>. Thanks to Andy
+           Benton for the patch.</para>
+         </listitem>
          <listitem>
            <para>[matthew] - Upgrade to GCC-4.7.0. Fixes

chapter01/whatsnew.xml

@@ -83 +83 @@
       <para>Gettext &gettext-version;</para>
     </listitem>-->
-    <!--<listitem>
+    <listitem>
       <para>Glibc &glibc-version;</para>
-    </listitem>-->
+    </listitem>
     <!--<listitem>
       <para>GMP &gmp-version;</para>
@@ -245 +245 @@
     </listitem>
 
+    <listitem>
+      <para>glibc-2.14.1-fixes-1.patch</para>
+    </listitem>
+
+    <listitem>
+      <para>glibc-2.14.1-gcc_fix-1.patch</para>
+    </listitem>
+
+    <listitem>
+      <para>glibc-2.14.1-cpuid-1.patch</para>
+    </listitem>
+
+    <listitem>
+      <para>glibc-2.14.1-sort-1.patch</para>
+    </listitem>
+
   </itemizedlist>
 

chapter03/patches.xml

@@ -64 +64 @@
         <para>Download: <ulink url="&patches-root;&gcc-startfiles-patch;"/></para>
         <para>MD5 sum: <literal>&gcc-startfiles-patch-md5;</literal></para>
-      </listitem>
-    </varlistentry>
-
-    <varlistentry>
-      <term>Glibc Bug Fixes Patch - <token>&glibc-fixes-patch-size;</token>:</term>
-      <listitem>
-        <para>Download: <ulink url="&patches-root;&glibc-fixes-patch;"/></para>
-        <para>MD5 sum: <literal>&glibc-fixes-patch-md5;</literal></para>
-      </listitem>
-    </varlistentry>
-
-    <varlistentry>
-      <term>Glibc Bug Sort Relocatable Objects Patch - <token>&glibc-sort-patch-size;</token>:</term>
-      <listitem>
-        <para>Download: <ulink url="&patches-root;&glibc-sort-patch;"/></para>
-        <para>MD5 sum: <literal>&glibc-sort-patch-md5;</literal></para>
-      </listitem>
-    </varlistentry>
-
-    <varlistentry>
-      <term>Glibc GCC Build Fix Patch - <token>&glibc-gcc_fix-patch-size;</token>:</term>
-      <listitem>
-        <para>Download: <ulink url="&patches-root;&glibc-gcc_fix-patch;"/></para>
-        <para>MD5 sum: <literal>&glibc-gcc_fix-patch-md5;</literal></para>
-      </listitem>
-    </varlistentry>
-
-    <varlistentry>
-      <term>Glibc GCC CPUID Patch - <token>&glibc-cpuid-patch-size;</token>:</term>
-      <listitem>
-        <para>Download: <ulink url="&patches-root;&glibc-cpuid-patch;"/></para>
-        <para>MD5 sum: <literal>&glibc-cpuid-patch-md5;</literal></para>
       </listitem>
     </varlistentry>

chapter05/glibc.xml

@@ -44 +44 @@
     <title>Installation of Glibc</title>
 
-    <para>Fix a bug that prevents Glibc from building with GCC-&gcc-version;:</para>
-
-    <screen><userinput remap="pre">patch -Np1 -i ../&glibc-gcc_fix-patch;</userinput></screen>
-
-    <para>Also address a header check that fails due to an incomplete build 
-    environment at this point:</para>
-
-    <screen><userinput remap="pre">patch -Np1 -i ../&glibc-cpuid-patch;</userinput></screen>
+     <para>Address a header check that fails due to an incomplete build
+     environment at this point:</para>
+
+    <screen><userinput remap="pre">sed -i 's#$ac_includes_default#\n\n#' sysdeps/i386/configure</userinput></screen>
+
+    <para>Fix a path that is hardcoded:</para>
+
+    <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
@@ -84 +84 @@
       --with-headers=/tools/include                   \
       libc_cv_forced_unwind=yes                       \
+      libc_cv_ctors_header=yes                        \
       libc_cv_c_cleanup=yes</userinput></screen>
 
@@ -150 +151 @@
           <command>configure</command> script so that the test is skipped and C
           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>

chapter06/glibc.xml

@@ -100 +100 @@
 
 <screen><userinput remap="pre">sed -i 's|@BASH@|/bin/bash|' elf/ldd.bash.in</userinput></screen>
-
-    <para>Fix a couple of bugs in Glibc that can cause crashes and core dumps:</para>
-
-<screen><userinput remap="pre">patch -Np1 -i ../&glibc-fixes-patch;
-patch -Np1 -i ../&glibc-sort-patch;</userinput></screen>
-
-    <para>Fix a bug that prevents Glibc from building with GCC-&gcc-version;:</para>
-
-<screen><userinput remap="pre">patch -Np1 -i ../&glibc-gcc_fix-patch;</userinput></screen>
-
-    <para>Fix a stack imbalance that occurs under some conditions:</para>
-
-<screen><userinput remap="pre">sed -i '195,213 s/PRIVATE_FUTEX/FUTEX_CLOCK_REALTIME/' \
-nptl/sysdeps/unix/sysv/linux/x86_64/pthread_rwlock_timed{rd,wr}lock.S</userinput></screen>
 
     <para>The Glibc documentation recommends building Glibc outside of the source

packages.ent

@@ -202 +202 @@
 <!ENTITY gettext-ch6-sbu "5.8 SBU">
 
-<!ENTITY glibc-version "2.14.1">
-<!ENTITY glibc-size "15,284 KB">
-<!ENTITY glibc-url "&gnu;glibc/glibc-&glibc-version;.tar.bz2">
-<!ENTITY glibc-md5 "5869a2620c6917dd392289864c6ce595">
+<!ENTITY glibc-version "2.15">
+<!ENTITY glibc-size "10,039 KB">
+<!ENTITY glibc-url "&gnu;glibc/glibc-&glibc-version;.tar.xz">
+<!ENTITY glibc-md5 "4f9f3b0e780a8c7179a372d34e9452bc">
 <!ENTITY glibc-home "&gnu-software;libc/">
 <!ENTITY glibc-ch5-du "501 MB">

patches.ent

@@ -35 +35 @@
 <!ENTITY gcc-startfiles-patch-md5 "799ef1971350d2e3c794f2123f247cc6">
 <!ENTITY gcc-startfiles-patch-size "1.5 KB">
-
-
-<!ENTITY glibc-fixes-patch "glibc-&glibc-version;-fixes-1.patch">
-<!ENTITY glibc-fixes-patch-md5 "13bdfb7db1654d9c3d7934d24479a6c4">
-<!ENTITY glibc-fixes-patch-size "5.5 KB">
-
-<!ENTITY glibc-gcc_fix-patch "glibc-&glibc-version;-gcc_fix-1.patch">
-<!ENTITY glibc-gcc_fix-patch-md5 "d1f28cb98acb9417fe52596908bbb9fd">
-<!ENTITY glibc-gcc_fix-patch-size "2.5 KB">
-
-<!ENTITY glibc-cpuid-patch "glibc-&glibc-version;-cpuid-1.patch">
-<!ENTITY glibc-cpuid-patch-md5 "4f110dc9c8d4754fbda841492ce796b4">
-<!ENTITY glibc-cpuid-patch-size "0.8 KB">
-
-<!ENTITY glibc-sort-patch "glibc-&glibc-version;-sort-1.patch">
-<!ENTITY glibc-sort-patch-md5 "740e71017059a4290761db0cc9dd63f3">
-<!ENTITY glibc-sort-patch-size "8.0 KB">