r2798 - in trunk: BOOK/appendices BOOK/content/databases BOOK/introduction/welcome patches

igor at linuxfromscratch.org igor at linuxfromscratch.org
Tue Oct 12 12:20:42 PDT 2004


Author: igor
Date: 2004-10-12 13:20:40 -0600 (Tue, 12 Oct 2004)
New Revision: 2798

Removed:
   trunk/patches/mysql-4.0.21-nptl-1.patch
Modified:
   trunk/BOOK/appendices/glossary.xml
   trunk/BOOK/content/databases/mysql.xml
   trunk/BOOK/introduction/welcome/changelog.xml
Log:
Changed MySQL instructions to compile without NPTL patch.

Modified: trunk/BOOK/appendices/glossary.xml
===================================================================
--- trunk/BOOK/appendices/glossary.xml	2004-10-12 17:13:42 UTC (rev 2797)
+++ trunk/BOOK/appendices/glossary.xml	2004-10-12 19:20:40 UTC (rev 2798)
@@ -419,6 +419,9 @@
 <glossentry id="gNIS"><glossterm><acronym>NIS</acronym></glossterm>
 <glossdef><para>Network Information Service</para></glossdef></glossentry>
 
+<glossentry id="gNPTL"><glossterm><acronym>NPTL</acronym></glossterm>
+<glossdef><para>Native Posix Thread Library</para></glossdef></glossentry>
+
 <glossentry id="gNTP"><glossterm><acronym>NTP</acronym></glossterm>
 <glossdef><para>Network Time Protocol</para></glossdef></glossentry>
 

Modified: trunk/BOOK/content/databases/mysql.xml
===================================================================
--- trunk/BOOK/content/databases/mysql.xml	2004-10-12 17:13:42 UTC (rev 2797)
+++ trunk/BOOK/content/databases/mysql.xml	2004-10-12 19:20:40 UTC (rev 2798)
@@ -39,12 +39,6 @@
 <listitem><para>Estimated build time: &mysql-time;</para></listitem></itemizedlist>
 </sect3>
 
-<sect3><title>Additional downloads</title>
-<itemizedlist spacing='compact'>
-<listitem><para>Required Patch (for building against NPTL): <ulink
-url="&patch-root;/mysql-&mysql-version;-nptl-1.patch"/></para></listitem>
-</itemizedlist></sect3>
-
 <sect3><title><application>My<acronym>SQL</acronym></application> dependencies
 </title>
 <sect4><title>Optional</title>
@@ -68,12 +62,12 @@
 <para>Build and install <application>My<acronym>SQL</acronym></application> by 
 running the following commands:</para>
 
-<screen><userinput><command>patch -Np1 -i ../mysql-&mysql-version;-nptl-1.patch &&
-./configure --prefix=/usr --sysconfdir=/etc \
+<screen><userinput><command>CPPFLAGS="-D_GNU_SOURCE" ./configure --prefix=/usr --sysconfdir=/etc \
     --libexecdir=/usr/sbin --localstatedir=/srv/mysql \
     --enable-thread-safe-client --enable-assembler \
     --without-readline --without-debug \
-    --enable-local-infile --without-bench &&
+    --enable-local-infile --without-bench \
+    --with-named-thread-libs=-lpthread &&
 make testdir=/usr/lib/mysql/mysql-test &&
 make testdir=/usr/lib/mysql/mysql-test install &&
 cd /usr/lib &&
@@ -109,6 +103,10 @@
 <para><option>--without-bench</option>: This switch skips building the 
 benchmark suite.</para>
 
+<para><parameter>CPPFLAGS="-D_GNU_SOURCE" --with-named-thread-libs=-lpthread</parameter>:
+This environment variable and configure switch enable building on
+<acronym>NPTL</acronym> systems.</para>
+
 <para><command>make testdir=...</command>: This installs the test suite in 
 <filename class='directory'>/usr/lib/mysql/mysql-test</filename>. 
 <acronym>BLFS</acronym> is currently seeking a method to omit the installation 

Modified: trunk/BOOK/introduction/welcome/changelog.xml
===================================================================
--- trunk/BOOK/introduction/welcome/changelog.xml	2004-10-12 17:13:42 UTC (rev 2797)
+++ trunk/BOOK/introduction/welcome/changelog.xml	2004-10-12 19:20:40 UTC (rev 2798)
@@ -21,6 +21,9 @@
 <para>&version; - &releasedate;</para>
 
 <itemizedlist>
+    
+<listitem><para>October 12th, 2004 [igor]: Changed MySQL instructions to
+compile without NPTL patch.</para></listitem>
 
 <listitem><para>October 12th, 2004 [igor]: Updated mouse configuration
 for XFree86 and removed information about installing XFree86's DRI

Deleted: trunk/patches/mysql-4.0.21-nptl-1.patch
===================================================================
--- trunk/patches/mysql-4.0.21-nptl-1.patch	2004-10-12 17:13:42 UTC (rev 2797)
+++ trunk/patches/mysql-4.0.21-nptl-1.patch	2004-10-12 19:20:40 UTC (rev 2798)
@@ -1,25 +0,0 @@
-Submitted By: Kevin P. Fleming (kpfleming at linuxfromscratch dot org)
-Date: 2004-04-16
-Initial Package Version: 4.0.18
-Origin: inspired by Gentoo CVS
-Description: Patches the configure script to bypass its brain-dead check
-             for a Linuxthreads-compatible threading library. On an NPTL
-             system this check will fail, but the library is present and
-             will work properly.
- 
-$LastChangedBy$
-$Date$
-
-diff -Naur mysql-4.0.18.orig/configure mysql-4.0.18/configure
---- mysql-4.0.18.orig/configure	Tue Feb 10 18:16:56 2004
-+++ mysql-4.0.18/configure	Sat Apr 17 03:35:56 2004
-@@ -23874,7 +23874,8 @@
-   # Look for LinuxThreads.
-   echo "$as_me:$LINENO: checking \"LinuxThreads\"" >&5
- echo $ECHO_N "checking \"LinuxThreads\"... $ECHO_C" >&6
--    res=`grep Linuxthreads /usr/include/pthread.h 2>/dev/null | wc -l`
-+    # res=`grep Linuxthreads /usr/include/pthread.h 2>/dev/null | wc -l`
-+    res=1
-     if test "$res" -gt 0
-     then
-       echo "$as_me:$LINENO: result: \"Found\"" >&5




More information about the blfs-book mailing list