浏览代码

Re-introduce the Glibc-libidn package as it is not included in the Glibc release tarball.

git-svn-id: http://svn.linuxfromscratch.org/LFS/trunk/BOOK@8848 4aa44e1e-78dd-0310-a6d2-fbcd4c07a689
Matthew Burgess 16 年之前
父节点
当前提交
9da9f24fff
共有 4 个文件被更改,包括 12 次插入7 次删除
  1. 5 0
      chapter01/changelog.xml
  2. 2 2
      chapter03/packages.xml
  3. 4 4
      chapter06/glibc.xml
  4. 1 1
      packages.ent

+ 5 - 0
chapter01/changelog.xml

@@ -40,6 +40,11 @@
     <listitem>
     <listitem>
       <para>2009-03-21</para>
       <para>2009-03-21</para>
       <itemizedlist>
       <itemizedlist>
+        <listitem>
+          <para>[matthew] - Re-introduce the Glibc-libidn package, as the
+          release tarball doesn't include it. Thanks to Alexander Kozlov for
+          the report.</para>
+        </listitem>
         <listitem>
         <listitem>
           <para>[matthew] - Upgrade to Udev-140. Fixes
           <para>[matthew] - Upgrade to Udev-140. Fixes
           <ulink url="&lfs-ticket-root;2370">#2370</ulink>.</para>
           <ulink url="&lfs-ticket-root;2370">#2370</ulink>.</para>

+ 2 - 2
chapter03/packages.xml

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

+ 4 - 4
chapter06/glibc.xml

@@ -61,14 +61,14 @@
     Glibc autoconf tests would give false results and defeat the goal
     Glibc autoconf tests would give false results and defeat the goal
     of achieving a clean build.</para>
     of achieving a clean build.</para>
 
 
-    <!-- <para>The glibc-libidn tarball adds support for internationalized domain
+    <para>The glibc-libidn tarball adds support for internationalized domain
     names (IDN) to Glibc. Many programs that support IDN require the full
     names (IDN) to Glibc. Many programs that support IDN require the full
     <filename class="libraryfile">libidn</filename> library, not this add-on (see
     <filename class="libraryfile">libidn</filename> library, not this add-on (see
     <ulink url="&blfs-root;view/svn/general/libidn.html"/>).
     <ulink url="&blfs-root;view/svn/general/libidn.html"/>).
     Unpack the tarball from within the Glibc source directory:</para>
     Unpack the tarball from within the Glibc source directory:</para>
 
 
 <screen><userinput remap="pre">tar -xvf ../glibc-libidn-&glibc-version;.tar.bz2
 <screen><userinput remap="pre">tar -xvf ../glibc-libidn-&glibc-version;.tar.bz2
-mv glibc-libidn-&glibc-version; libidn</userinput></screen>-->
+mv glibc-libidn-&glibc-version; libidn</userinput></screen>
 
 
     <para>In the vi_VN.TCVN locale, <command>bash</command> enters an infinite
     <para>In the vi_VN.TCVN locale, <command>bash</command> enters an infinite
     loop at startup. It is unknown whether this is a <command>bash</command>
     loop at startup. It is unknown whether this is a <command>bash</command>
@@ -77,7 +77,7 @@ mv glibc-libidn-&glibc-version; libidn</userinput></screen>-->
 
 
 <screen><userinput remap="pre">sed -i '/vi_VN.TCVN/d' localedata/SUPPORTED</userinput></screen>
 <screen><userinput remap="pre">sed -i '/vi_VN.TCVN/d' localedata/SUPPORTED</userinput></screen>
 
 
-    <!-- <para>When running <command>make install</command>, a script called
+    <para>When running <command>make install</command>, a script called
     <filename>test-installation.pl</filename> performs a small sanity test on
     <filename>test-installation.pl</filename> performs a small sanity test on
     our newly installed Glibc. However, because our toolchain still points to
     our newly installed Glibc. However, because our toolchain still points to
     the <filename class="directory">/tools</filename> directory, the sanity
     the <filename class="directory">/tools</filename> directory, the sanity
@@ -88,7 +88,7 @@ mv glibc-libidn-&glibc-version; libidn</userinput></screen>-->
 awk '{print $4}' | sed -e 's@/tools@@' -e 's@]$@@')
 awk '{print $4}' | sed -e 's@/tools@@' -e 's@]$@@')
 sed -i &quot;s|libs -o|libs -L/usr/lib -Wl,-dynamic-linker=$DL -o|&quot; \
 sed -i &quot;s|libs -o|libs -L/usr/lib -Wl,-dynamic-linker=$DL -o|&quot; \
         scripts/test-installation.pl
         scripts/test-installation.pl
-unset DL</userinput></screen> -->
+unset DL</userinput></screen>
 
 
     <para>First apply a patch which corrects a failure in the test suite:</para>
     <para>First apply a patch which corrects a failure in the test suite:</para>
 
 

+ 1 - 1
packages.ent

@@ -199,7 +199,7 @@
 <!ENTITY glibc-libidn-version "&glibc-version;">
 <!ENTITY glibc-libidn-version "&glibc-version;">
 <!ENTITY glibc-libidn-size "100 KB">
 <!ENTITY glibc-libidn-size "100 KB">
 <!ENTITY glibc-libidn-url "&gnu;glibc/glibc-libidn-&glibc-libidn-version;.tar.bz2">
 <!ENTITY glibc-libidn-url "&gnu;glibc/glibc-libidn-&glibc-libidn-version;.tar.bz2">
-<!ENTITY glibc-libidn-md5 "226809992fb1f3dc6ea23e0f26952ea4">
+<!ENTITY glibc-libidn-md5 "99536b508af988e7cc6275944d12b491">
 <!ENTITY glibc-libidn-home " ">
 <!ENTITY glibc-libidn-home " ">
 
 
 <!ENTITY gmp-version "4.2.4">
 <!ENTITY gmp-version "4.2.4">