[blfs-book] r19067 - in trunk/BOOK: server/databases x/lib

[via blfs-book]

Author: bdubbs
Date: Tue Aug 22 15:20:46 2017
New Revision: 19067

Log:
Tag qt5 and fix mariadb so qt can find a header.

Modified:
   trunk/BOOK/server/databases/mariadb.xml
   trunk/BOOK/x/lib/qt5.xml

Modified: trunk/BOOK/server/databases/mariadb.xml
==============================================================================
--- trunk/BOOK/server/databases/mariadb.xml     Tue Aug 22 13:27:15 2017        
(r19066)
+++ trunk/BOOK/server/databases/mariadb.xml     Tue Aug 22 15:20:46 2017        
(r19067)
@@ -191,7 +191,8 @@
       Now, as the <systemitem class="username">root</systemitem> user:
     </para>
 
-<screen role="root"><userinput>make install</userinput></screen>
+<screen role="root"><userinput>make install &amp;&amp;
+ln -sfv /usr/include/mysql/{mariadb,mysql}_version.h</userinput></screen>
 
   </sect2>
 
@@ -237,6 +238,12 @@
       customization options.
     </para></note>
 
+    <para>
+      <command>ln -s /usr/include/mysql/{mariadb,mysql}_version.h</command>: 
+      Some applications, for example <xref linkend='qt5'/>, look specifically 
for 
+      mysql_version.h.  This symbolic link ensures the proper file can be 
found.
+    </para>
+
 
   </sect2>
 

Modified: trunk/BOOK/x/lib/qt5.xml
==============================================================================
--- trunk/BOOK/x/lib/qt5.xml    Tue Aug 22 13:27:15 2017        (r19066)
+++ trunk/BOOK/x/lib/qt5.xml    Tue Aug 22 15:20:46 2017        (r19067)
@@ -42,7 +42,7 @@
       Frameworks 5 (KF5)</application>.
     </para>
 
-    &lfs80_checked;
+    &lfs81_checked;
 
     <bridgehead renderas="sect3">Package Information</bridgehead>
     <itemizedlist spacing="compact">
@@ -223,6 +223,9 @@
             -examplesdir    /usr/share/doc/qt5/examples</userinput></screen>
     </note>
 
+<!--  Not needed with mariadb-10.2.8, but a symlink for mysql_version.h
+      on the mariadb page, is needed.
+
     <para>
       If you have <xref linkend="mariadb"/> installed, fix a build issue with
       with <application>MySQL</application> compatibility:
@@ -230,6 +233,7 @@
 
 <screen><userinput>sed '/qsqlresult_p.h&gt;/a#include 
&lt;mysql/mysql_version.h&gt;' \
     -i qtbase/src/plugins/sqldrivers/mysql/qsql_mysql.cpp</userinput></screen>
+-->
 
     <para>
       Install <application>Qt5</application> by running the following commands:
-- 
http://lists.linuxfromscratch.org/listinfo/blfs-book
FAQ: http://www.linuxfromscratch.org/blfs/faq.html
Unsubscribe: See the above information page