[blfs-book] r19879 - in trunk/BOOK: . general/genlib introduction/welcome

[via blfs-book]

Author: pierre
Date: Sun Feb 25 23:28:56 2018
New Revision: 19879

Log:
Disable the use of unixODBC in ptlib, to prevent type conflicts

Modified:
   trunk/BOOK/general.ent
   trunk/BOOK/general/genlib/ptlib.xml
   trunk/BOOK/introduction/welcome/changelog.xml

Modified: trunk/BOOK/general.ent
==============================================================================
--- trunk/BOOK/general.ent      Sun Feb 25 23:26:25 2018        (r19878)
+++ trunk/BOOK/general.ent      Sun Feb 25 23:28:56 2018        (r19879)
@@ -1,12 +1,12 @@
 <!-- $LastChangedBy$ $Date$ -->
 
-<!ENTITY day          "25">                   <!-- Always 2 digits -->
+<!ENTITY day          "26">                   <!-- Always 2 digits -->
 <!ENTITY month        "02">                   <!-- Always 2 digits -->
 <!ENTITY year         "2018">
 <!ENTITY copyrightdate "2001-&year;">
 <!ENTITY copyholder   "The BLFS Development Team">
 <!ENTITY version      "&year;-&month;-&day;">
-<!ENTITY releasedate  "February 25th, &year;">
+<!ENTITY releasedate  "February 26th, &year;">
 <!ENTITY pubdate      "&year;-&month;-&day;"> <!-- metadata req. by TLDP -->
 <!ENTITY blfs-version "svn">                  <!-- svn|[release #] -->
 <!ENTITY lfs-version  "development">          <!-- x.y|development -->

Modified: trunk/BOOK/general/genlib/ptlib.xml
==============================================================================
--- trunk/BOOK/general/genlib/ptlib.xml Sun Feb 25 23:26:25 2018        (r19878)
+++ trunk/BOOK/general/genlib/ptlib.xml Sun Feb 25 23:28:56 2018        (r19879)
@@ -102,7 +102,8 @@
       <xref linkend="openldap"/>,
       <xref linkend="pulseaudio"/>,
       <xref linkend="sdl"/>,
-      <xref linkend="unixodbc"/>,
+      <xref linkend="unixodbc"/> (currently broken, see <emphasis>Command
+        Explanations</emphasis> below),
       <xref linkend="v4l-utils"/>,
       <ulink 
url="http://sourceforge.net/projects/libdc1394/";>libdc1394</ulink>, and
       <ulink url="http://www.linux1394.org/";>libraw1394</ulink>,
@@ -126,15 +127,6 @@
 sed -i '/\/ioctl.h/a#include &lt;sys/uio.h&gt;' 
src/ptlib/unix/channel.cxx</userinput></screen>
 
     <para>
-      Fix a build issue with glibc-2.27 and later:
-    </para>
-
-<screen><userinput>sed -e '/WCHAR;/s:^://:' \
-    -e '/UINT;/ s:^://:' \
-    -e '/limits.h/a #include &lt;sqltypes.h&gt;' \
-    -i include/ptlib/unix/ptlib/contain.h</userinput></screen>
-
-    <para>
       Install <application>Ptlib</application> by running the following
       commands:
     </para>
@@ -142,7 +134,8 @@
 <screen><userinput>patch -Np1 -i 
../ptlib-&ptlib-version;-openssl-1.1.0-1.patch &amp;&amp;
 patch -Np1 -i ../ptlib-&ptlib-version;-bison_fixes-2.patch &amp;&amp;
 
-./configure --prefix=/usr &amp;&amp;
+./configure --prefix=/usr  \
+            --disable-odbc &amp;&amp;
 make</userinput></screen>
 
     <para>
@@ -158,6 +151,18 @@
 
   </sect2>
 
+  <sect2 role="commands">
+    <title>Command Explanations</title>
+
+    <para>
+      <parameter>--disable-odbc</parameter>: This parameter prevents the use
+      of <xref linkend="unixodbc"/>, whose libraries conflict with
+      <application>ptlib</application>. It is not needed if
+      <xref linkend="unixodbc"/> is not installed.
+    </para>
+
+  </sect2>
+
   <sect2 role="content">
     <title>Contents</title>
 

Modified: trunk/BOOK/introduction/welcome/changelog.xml
==============================================================================
--- trunk/BOOK/introduction/welcome/changelog.xml       Sun Feb 25 23:26:25 
2018        (r19878)
+++ trunk/BOOK/introduction/welcome/changelog.xml       Sun Feb 25 23:28:56 
2018        (r19879)
@@ -42,6 +42,16 @@
     </listitem>
 -->
     <listitem>
+      <para>February 26th, 2018</para>
+     <itemizedlist>
+        <listitem>
+          <para>[pierre] - Disable the use of unix-odbc in ptlib, to prevent
+          a type conflict.</para>
+        </listitem>
+      </itemizedlist>
+    </listitem>
+
+    <listitem>
       <para>February 25th, 2018</para>
      <itemizedlist>
         <listitem>
-- 
http://lists.linuxfromscratch.org/listinfo/blfs-book
FAQ: http://www.linuxfromscratch.org/blfs/faq.html
Unsubscribe: See the above information page