1
0
Quellcode durchsuchen

Upgrade to Glibc-2.11. Fixes #2509.

git-svn-id: http://svn.linuxfromscratch.org/LFS/trunk/BOOK@9095 4aa44e1e-78dd-0310-a6d2-fbcd4c07a689
Matthew Burgess vor 15 Jahren
Ursprung
Commit
9a314770aa
8 geänderte Dateien mit 9 neuen und 82 gelöschten Zeilen
  1. 4 0
      chapter01/changelog.xml
  2. 2 6
      chapter01/whatsnew.xml
  3. 0 9
      chapter03/packages.xml
  4. 0 8
      chapter03/patches.xml
  5. 0 15
      chapter05/glibc.xml
  6. 0 31
      chapter06/glibc.xml
  7. 3 8
      packages.ent
  8. 0 5
      patches.ent

+ 4 - 0
chapter01/changelog.xml

@@ -40,6 +40,10 @@
     <listitem>
       <para>2009-11-06</para>
       <itemizedlist>
+        <listitem>
+          <para>[matthew] Upgraded to Glibc-2.11. Fixes
+          <ulink url="&lfs-ticket-root;2509">#2509</ulink>.</para>
+        </listitem>
         <listitem>
           <para>[matthew] Upgraded to latest upstream patches for Bash.</para>
         </listitem>

+ 2 - 6
chapter01/whatsnew.xml

@@ -79,9 +79,9 @@
     <!--<listitem>
       <para>Gettext &gettext-version;</para>
     </listitem>-->
-    <!--<listitem>
+    <listitem>
       <para>Glibc &glibc-version;</para>
-    </listitem>-->
+    </listitem>
     <!--<listitem>
       <para>GMP &gmp-version;</para>
     </listitem>-->
@@ -222,10 +222,6 @@
       <para>coreutils-7.6-uname-1.patch</para>
     </listitem>
 
-    <listitem>
-      <para>glibc-2.10.1-binutils-1.patch</para>
-    </listitem>
-
     <listitem>
       <para>gzip-1.3.13-zdiff-1.patch</para>
     </listitem>

+ 0 - 9
chapter03/packages.xml

@@ -194,15 +194,6 @@
       </listitem>
     </varlistentry>
 
-    <varlistentry>
-      <term>Glibc LibIDN add-on (&glibc-libidn-version;) - <token>&glibc-libidn-size;</token>:</term>
-      <listitem>
-        <para>Home page: <ulink url="&glibc-libidn-home;"/></para>
-        <para>Download: <ulink url="&glibc-libidn-url;"/></para>
-        <para>MD5 sum: <literal>&glibc-libidn-md5;</literal></para>
-      </listitem>
-    </varlistentry>
-
     <varlistentry>
       <term>GMP (&gmp-version;) - <token>&gmp-size;</token>:</term>
       <listitem>

+ 0 - 8
chapter03/patches.xml

@@ -98,14 +98,6 @@
       </listitem>
     </varlistentry>
 
-    <varlistentry>
-      <term>Glibc Binutils Patch - <token>&glibc-binutils-patch-size;</token>:</term>
-      <listitem>
-        <para>Download: <ulink url="&patches-root;&glibc-binutils-patch;"/></para>
-        <para>MD5 sum: <literal>&glibc-binutils-patch-md5;</literal></para>
-      </listitem>
-    </varlistentry>
-
     <varlistentry>
       <term>Grep Debian Patch - <token>&grep-debian-patch-size;</token>:</term>
       <listitem>

+ 0 - 15
chapter05/glibc.xml

@@ -43,21 +43,6 @@
   <sect2 role="installation">
     <title>Installation of Glibc</title>
 
-    <para>Apply a patch so that Glibc will build against
-    Binutils-&binutils-version;:</para>
-
-<screen><userinput remap="pre">patch -Np1 -i ../&glibc-binutils-patch;</userinput></screen>
-
-    <!-- This sed can be removed for any glibc newer than 2.10.1 (along with the
-         matching sed in chapter 6).  See glibc bug 10262. -->
-    <para>Fix an error in the constants that get passed to the futex system
-    call in some cases, causing certain pthread_mutex operations to fail:</para>
-
-<screen><userinput remap="pre">cp -v nptl/sysdeps/unix/sysv/linux/i386/i486/lowlevellock.S{,.orig}
-sed -e 's/FUTEX_WAIT\( | FUTEX_CLOCK_REALTIME, reg\)/FUTEX_WAIT_BITSET\1/' \
-        &lt;nptl/sysdeps/unix/sysv/linux/i386/i486/lowlevellock.S.orig \
-        &gt;nptl/sysdeps/unix/sysv/linux/i386/i486/lowlevellock.S</userinput></screen>
-
     <para>The Glibc documentation recommends building Glibc outside of the source
     directory in a dedicated build directory:</para>
 

+ 0 - 31
chapter06/glibc.xml

@@ -61,15 +61,6 @@
     Glibc autoconf tests would give false results and defeat the goal
     of achieving a clean build.</para>
 
-    <para>The glibc-libidn tarball adds support for internationalized domain
-    names (IDN) to Glibc. Many programs that support IDN require the full
-    <filename class="libraryfile">libidn</filename> library, not this add-on (see
-    <ulink url="&blfs-root;view/svn/general/libidn.html"/>).
-    Unpack the tarball from within the Glibc source directory:</para>
-
-<screen><userinput remap="pre">tar -xvf ../glibc-libidn-&glibc-version;.tar.bz2
-mv -v glibc-libidn-&glibc-version; libidn</userinput></screen>
-
 <!--
     This should have been fixed a long time ago.
 
@@ -101,28 +92,6 @@ unset DL</userinput></screen>
 
 <screen><userinput remap="pre">sed -i 's|@BASH@|/bin/bash|' elf/ldd.bash.in</userinput></screen>
 
-    <para>Apply a patch so that Glibc will build against
-    Binutils-&binutils-version;:</para>
-
-<screen><userinput remap="pre">patch -Np1 -i ../&glibc-binutils-patch;</userinput></screen>
-
-    <para>Fix an error in one of the make check routines.  Note that the escaped
-    newline in the second <command>sed</command> is required:</para>
-
-<screen><userinput remap="pre">sed -i s/utf8/UTF-8/ libio/tst-fgetwc.c
-sed -i '/tst-fgetws-ENV/ a\
-tst-fgetwc-ENV = LOCPATH=$(common-objpfx)localedata' libio/Makefile</userinput></screen>
-
-    <!-- This sed can be removed for any glibc newer than 2.10.1 (along with the
-         matching sed in chapter 5).  See glibc bug 10262. -->
-    <para>Fix an error in the constants that get passed to the futex system
-    call in some cases, causing certain pthread_mutex operations to fail:</para>
-
-<!-- Format below is for proper pdf generation -->
-<screen><userinput remap="pre">sed -i \
-    -e 's/FUTEX_WAIT\( | FUTEX_CLOCK_REALTIME, reg\)/FUTEX_WAIT_BITSET\1/' \
-    nptl/sysdeps/unix/sysv/linux/i386/i486/lowlevellock.S</userinput></screen>
-
     <para>The Glibc documentation recommends building Glibc outside of the source
     directory in a dedicated build directory:</para>
 

+ 3 - 8
packages.ent

@@ -189,20 +189,15 @@
 <!ENTITY gettext-ch6-du "125 MB">
 <!ENTITY gettext-ch6-sbu "5.8 SBU">
 
-<!ENTITY glibc-version "2.10.1">
-<!ENTITY glibc-size "15,729 KB">
+<!ENTITY glibc-version "2.11">
+<!ENTITY glibc-size "15,317 KB">
 <!ENTITY glibc-url "&gnu;glibc/glibc-&glibc-version;.tar.bz2">
-<!ENTITY glibc-md5 "ee71dedf724dc775e4efec9b823ed3be">
+<!ENTITY glibc-md5 "2c990f97e9ff9fb1c3c85fe826e991b9">
 <!ENTITY glibc-home "&gnu-software;libc/">
 <!ENTITY glibc-ch5-du "371 MB">
 <!ENTITY glibc-ch5-sbu "6.9 SBU">
 <!ENTITY glibc-ch6-du "637 MB testsuite included">
 <!ENTITY glibc-ch6-sbu "16.9 SBU testsuite included">
-<!ENTITY glibc-libidn-version "&glibc-version;">
-<!ENTITY glibc-libidn-size "100 KB">
-<!ENTITY glibc-libidn-url "&gnu;glibc/glibc-libidn-&glibc-libidn-version;.tar.bz2">
-<!ENTITY glibc-libidn-md5 "8ef88560ec608d5923ee05eb5f0e15ea">
-<!ENTITY glibc-libidn-home " ">
 
 <!ENTITY gmp-version "4.3.1">
 <!ENTITY gmp-size "1,838 KB">

+ 0 - 5
patches.ent

@@ -50,11 +50,6 @@
 <!ENTITY gettext-upstream_fixes-patch-size "2.9 KB">
 
 
-<!ENTITY glibc-binutils-patch "glibc-&glibc-version;-binutils-1.patch">
-<!ENTITY glibc-binutils-patch-md5 "ca5556631709e572738ed1d2c8b2b177">
-<!ENTITY glibc-binutils-patch-size "2.8 KB">
-
-
 <!ENTITY grep-debian-patch "grep-&grep-version;-debian_fixes-1.patch">
 <!ENTITY grep-debian-patch-md5 "337d017202d7e3b08d428a89da3ee572">
 <!ENTITY grep-debian-patch-size "27 KB">