r1328 - in trunk/BOOK: . chapter01 chapter05 chapter06

robert at linuxfromscratch.org robert at linuxfromscratch.org
Fri Jan 18 08:37:33 PST 2008


Author: robert
Date: 2008-01-18 09:37:32 -0700 (Fri, 18 Jan 2008)
New Revision: 1328

Modified:
   trunk/BOOK/chapter01/changelog.xml
   trunk/BOOK/chapter05/gettext.xml
   trunk/BOOK/chapter06/butterfly-toolchain.xml
   trunk/BOOK/general.ent
Log:
Don't install libintl.so twice in chap5, and modify the libstdc++-v3 build, for uClibc

Modified: trunk/BOOK/chapter01/changelog.xml
===================================================================
--- trunk/BOOK/chapter01/changelog.xml	2008-01-18 03:20:11 UTC (rev 1327)
+++ trunk/BOOK/chapter01/changelog.xml	2008-01-18 16:37:32 UTC (rev 1328)
@@ -49,6 +49,16 @@
 -->
 
     <listitem>
+      <para>January 18th, 2008</para>
+      <itemizedlist>
+        <listitem>
+          <para>[robert] - Don't install libintl.so twice in chap5,
+          and modify the libstdc++-v3 build, for uClibc.</para>
+        </listitem>
+      </itemizedlist>
+    </listitem>
+
+    <listitem>
       <para>January 17th, 2008</para>
       <itemizedlist>
         <listitem>

Modified: trunk/BOOK/chapter05/gettext.xml
===================================================================
--- trunk/BOOK/chapter05/gettext.xml	2008-01-18 03:20:11 UTC (rev 1327)
+++ trunk/BOOK/chapter05/gettext.xml	2008-01-18 16:37:32 UTC (rev 1328)
@@ -40,13 +40,10 @@
 
     <para>Prepare Gettext for compilation:</para>
 
-<screen condition="glibc"><userinput>cd gettext-tools
+<screen><userinput>cd gettext-tools
 ./configure --prefix=/tools --disable-shared</userinput></screen>
 
-<screen condition="uclibc"><userinput>cd gettext-tools
-./configure --prefix=/tools</userinput></screen>
-
-    <variablelist condition="glibc">
+    <variablelist>
       <title>The meaning of the configure option:</title>
 
       <varlistentry>
@@ -61,23 +58,13 @@
 
     <para>Compile the package:</para>
 
-<screen condition="uclibc"><userinput>make -C intl
-make -C gnulib-lib
+<screen><userinput>make -C gnulib-lib
 make -C src msgfmt</userinput></screen>
 
-<screen condition="glibc"><userinput>make -C gnulib-lib
-make -C src msgfmt</userinput></screen>
+    <para>Install the <command>msgfmt</command> binary:</para>
 
-    <para condition="glibc">Install the <command>msgfmt</command> binary:</para>
+<screen><userinput>install -v src/msgfmt /tools/bin</userinput></screen>
 
-<screen condition="glibc"><userinput>install -v src/msgfmt /tools/bin</userinput></screen>
-
-    <para condition="uclibc">Install the <command>msgfmt</command> binary and
-    <filename class="libraryfile">libintl.so</filename> library:</para>
-
-<screen condition="uclibc"><userinput>install -v src/msgfmt /tools/bin
-make -C intl install</userinput></screen>
-
   </sect2>
 
   <sect2 role="content">

Modified: trunk/BOOK/chapter06/butterfly-toolchain.xml
===================================================================
--- trunk/BOOK/chapter06/butterfly-toolchain.xml	2008-01-18 03:20:11 UTC (rev 1327)
+++ trunk/BOOK/chapter06/butterfly-toolchain.xml	2008-01-18 16:37:32 UTC (rev 1328)
@@ -140,6 +140,16 @@
 patch -Np1 -i ../&gcc-uClibc_conf-patch;
 patch -Np1 -i ../&gcc-uClibc_locale-patch;</userinput></screen>
 
+    <para condition="uclibc">The following commands work around a
+    problem where GCC links <filename
+    class="libraryfile">libssp_nonshared.a</filename> multiple times,
+    and causes multiple definitions of symbols:</para>
+
+<screen condition="uclibc"><userinput>echo 'postdeps="${postdeps//-lssp_nonshared}"' >> ltcf-cxx.sh
+echo 'postdeps="${postdeps//-lssp}"' >> ltcf-cxx.sh
+sed 's@\$(LIBS)@& -lssp_nonshared -lssp@' -i.orig \
+    ./libstdc++-v3/src/Makefile.in</userinput></screen>
+
     <para condition="uclibc">Use this command to hardcode
     <parameter>LIBS="-lintl"</parameter>:</para>
 

Modified: trunk/BOOK/general.ent
===================================================================
--- trunk/BOOK/general.ent	2008-01-18 03:20:11 UTC (rev 1327)
+++ trunk/BOOK/general.ent	2008-01-18 16:37:32 UTC (rev 1328)
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="ISO-8859-1"?>
-<!ENTITY version "SVN-20080117">
-<!ENTITY releasedate "January 17th, 2008">
+<!ENTITY version "SVN-20080118">
+<!ENTITY releasedate "January 18th, 2008">
 <!ENTITY milestone "0.5">
 
 <!ENTITY lfs-root "http://www.linuxfromscratch.org/">




More information about the hlfs-book mailing list