Explorar o código

's/DB/Berkeley DB/' and remove -lpthread overrides from it.

git-svn-id: http://svn.linuxfromscratch.org/LFS/trunk/BOOK@7255 4aa44e1e-78dd-0310-a6d2-fbcd4c07a689
Ken Moffat %!s(int64=19) %!d(string=hai) anos
pai
achega
693e2fbc1e
Modificáronse 3 ficheiros con 15 adicións e 21 borrados
  1. 5 1
      chapter01/changelog.xml
  2. 7 7
      chapter03/packages.xml
  3. 3 13
      chapter06/db.xml

+ 5 - 1
chapter01/changelog.xml

@@ -96,7 +96,7 @@ First a summary, then a detailed log.</para>
 <listitem><para>&bzip2-docs-patch;</para></listitem>
 <listitem><para>&bzip2-docs-patch;</para></listitem>
 <listitem><para>&gawk-segfault-patch;</para></listitem>
 <listitem><para>&gawk-segfault-patch;</para></listitem>
 <listitem><para>&gcc-specs-patch;</para></listitem>
 <listitem><para>&gcc-specs-patch;</para></listitem>
-<listitem><para>DB-&db-version;</para></listitem>
+<listitem><para>Berkeley DB-&db-version;</para></listitem>
 <listitem><para>&inetutils-gcc4_fixes-patch;</para></listitem>
 <listitem><para>&inetutils-gcc4_fixes-patch;</para></listitem>
 <listitem><para>&kbd-gcc4_fixes-patch;</para></listitem>
 <listitem><para>&kbd-gcc4_fixes-patch;</para></listitem>
 <listitem><para>MAN-DB-&man-db-version;</para></listitem>
 <listitem><para>MAN-DB-&man-db-version;</para></listitem>
@@ -124,6 +124,10 @@ First a summary, then a detailed log.</para>
 </itemizedlist>
 </itemizedlist>
 </listitem>
 </listitem>
 
 
+<listitem><para>January 7, 2006 [ken]: Give Berkeley DB its full name,
+and remove the '-lpthread' overrides.</para>
+</listitem>
+
 <listitem><para>January 5, 2006 [jhuntwork]: Remove mention of news
 <listitem><para>January 5, 2006 [jhuntwork]: Remove mention of news
 server until we actually have one. Thanks Randy.</para>
 server until we actually have one. Thanks Randy.</para>
 </listitem>
 </listitem>

+ 7 - 7
chapter03/packages.xml

@@ -39,6 +39,13 @@
 </listitem>
 </listitem>
 </varlistentry>
 </varlistentry>
 
 
+<varlistentry>
+<term>Berkeley DB (&db-version;) - 7,925 KB:</term>
+<listitem>
+<para><ulink url="http://dev.sleepycat.com/"/></para>
+</listitem>
+</varlistentry>
+
 <varlistentry>
 <varlistentry>
 <term>Binutils (&binutils-version;) - 12,272 KB:</term>
 <term>Binutils (&binutils-version;) - 12,272 KB:</term>
 <listitem>
 <listitem>
@@ -67,13 +74,6 @@
 </listitem>
 </listitem>
 </varlistentry>
 </varlistentry>
 
 
-<varlistentry>
-<term>DB (&db-version;) - 7,925 KB:</term>
-<listitem>
-<para><ulink url="http://dev.sleepycat.com/"/></para>
-</listitem>
-</varlistentry>
-
 <varlistentry>
 <varlistentry>
 <term>DejaGNU (&dejagnu-version;) - 852 KB:</term>
 <term>DejaGNU (&dejagnu-version;) - 852 KB:</term>
 <listitem>
 <listitem>

+ 3 - 13
chapter06/db.xml

@@ -4,13 +4,13 @@
   %general-entities;
   %general-entities;
 ]>
 ]>
 <sect1 id="ch-system-db" role="wrap">
 <sect1 id="ch-system-db" role="wrap">
-<title>DB-&db-version;</title>
+<title>Berkeley DB-&db-version;</title>
 <?dbhtml filename="db.html"?>
 <?dbhtml filename="db.html"?>
 
 
 <indexterm zone="ch-system-db"><primary sortas="a-DB">Berkeley DB</primary></indexterm>
 <indexterm zone="ch-system-db"><primary sortas="a-DB">Berkeley DB</primary></indexterm>
 
 
 <sect2 role="package"><title/>
 <sect2 role="package"><title/>
-<para>The DB package contains programs and utilities used by many other
+<para>The Berkeley DB package contains programs and utilities used by many other
 applications for database related functions.</para>
 applications for database related functions.</para>
 
 
 <segmentedlist>
 <segmentedlist>
@@ -50,17 +50,7 @@ Diffutils, GCC, Glibc, Make and Sed.</seg></seglistitem>
 
 
 <para>Compile the package:</para>
 <para>Compile the package:</para>
 
 
-<screen><userinput>make LIBSO_LIBS="-lpthread" LIBXSO_LIBS="-lpthread"</userinput></screen>
-
-<para>The meaning of the make option:</para>
-
-<variablelist>
-<varlistentry>
-<term><parameter>LIBSO_LIBS="-lpthread" LIBXSO_LIBS="-lpthread"</parameter></term>
-<listitem><para>These variables work around a bug in the <command>configure</command>
-script that causes the DB libraries not to link against NPTL libraries</para></listitem>
-</varlistentry>
-</variablelist>
+<screen><userinput>make</userinput></screen>
 
 
 <para>It is not possible to test the package meaningfully, because that
 <para>It is not possible to test the package meaningfully, because that
 would involve building TCL bindings. TCL bindings cannot be built properly
 would involve building TCL bindings. TCL bindings cannot be built properly