Changeset 3b9d6d27

Timestamp:

02/26/2018 07:28:56 AM (6 years ago)

Author:

Pierre Labastie <pieere@…>

Branches:

10.0, 10.1, 11.0, 11.1, 11.2, 11.3, 12.0, 8.2, 8.3, 8.4, 9.0, 9.1, basic, bdubbs/svn, elogind, kea, ken/inkscape-core-mods, lazarus, lxqt, perl-modules, plabs/python-mods, qt5new, trunk, upgradedb, xry111/intltool, xry111/soup3, xry111/test-20220226, xry111/xf86-video-removal

Children:

67687b75

Parents:

719422a8

Message:

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

git-svn-id: svn://svn.linuxfromscratch.org/BLFS/trunk/BOOK@19879 af4574ff-66df-0310-9fd7-8a98e5e911e0

Files:

• general.ent (modified) (2 diffs)
• general/genlib/ptlib.xml (modified) (4 diffs)
• introduction/welcome/changelog.xml (modified) (1 diff)

general.ent

@@ -1 +1 @@
 <!-- $LastChangedBy$ $Date$ -->
 
-<!ENTITY day          "25">                   <!-- Always 2 digits -->
+<!ENTITY day          "26">                   <!-- Always 2 digits -->
 <!ENTITY month        "02">                   <!-- Always 2 digits -->
 <!ENTITY year         "2018">
@@ -7 +7 @@
 <!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 #] -->

general/genlib/ptlib.xml

@@ -103 +103 @@
       <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
@@ -127 +128 @@
 
     <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:
@@ -143 +135 @@
 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>
 
@@ -156 +149 @@
 <screen role="root"><userinput>make install &amp;&amp;
 chmod -v 755 /usr/lib/libpt.so.&ptlib-version;</userinput></screen>
+
+  </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>

introduction/welcome/changelog.xml

@@ -42 +42 @@
     </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>