Changeset 7af92fe5 for general/genlib

Timestamp:

06/02/2013 07:23:30 PM (11 years ago)

Author:

Krejzi <krejzi@…>

Branches:

10.0, 10.1, 11.0, 11.1, 11.2, 11.3, 12.0, 12.1, 7.10, 7.4, 7.5, 7.6, 7.6-blfs, 7.6-systemd, 7.7, 7.8, 7.9, 8.0, 8.1, 8.2, 8.3, 8.4, 9.0, 9.1, basic, bdubbs/svn, elogind, gnome, kde5-13430, kde5-14269, kde5-14686, kea, ken/TL2024, ken/inkscape-core-mods, ken/tuningfonts, krejzi/svn, lazarus, lxqt, nosym, perl-modules, plabs/newcss, plabs/python-mods, python3.11, qt5new, rahul/power-profiles-daemon, renodr/vulkan-addition, systemd-11177, systemd-13485, trunk, upgradedb, xry111/intltool, xry111/llvm18, xry111/soup3, xry111/test-20220226, xry111/xf86-video-removal

Children:

ad24d3e1

Parents:

88647e80

Message:

Qt instructions update: Install in /usr by default, don't install executable files in /usr/bin by default - symlink them for now. They will conflict with Qt5 versions. Qtchooser package will handle which Qt version is in use when the time is right.

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

Location:

general/genlib

Files:

• libdbusmenuqt.xml (modified) (3 diffs)
• qca.xml (modified) (3 diffs)
• qjson.xml (modified) (3 diffs)

general/genlib/libdbusmenuqt.xml

@@ -70 +70 @@
     <bridgehead renderas="sect4">Required</bridgehead>
     <para role="required">
-    <xref linkend="qt"/>
+    <xref linkend="qt4"/>
     </para>
 
@@ -92 +92 @@
 <screen><userinput>mkdir build &amp;&amp;
 cd build &amp;&amp;
-cmake -DCMAKE_INSTALL_PREFIX=&qt-dir; \
+cmake -DCMAKE_INSTALL_PREFIX=&qt4-dir; \
       -DWITH_DOC=OFF .. &amp;&amp;
 make</userinput></screen>
@@ -126 +126 @@
         <seg>None</seg>
         <seg>libdbusmenu-qt.so</seg>
-        <seg>&qt-dir;/include/dbusmenu-qt</seg>
+        <seg>&qt4-dir;/include/dbusmenu-qt</seg>
       </seglistitem>
     </segmentedlist>

general/genlib/qca.xml

@@ -72 +72 @@
     <bridgehead renderas="sect4">Required</bridgehead>
     <para role="required">
-    <xref linkend="qt"/> and
+    <xref linkend="qt4"/> and
     <xref linkend="which"/>
     </para>
@@ -88 +88 @@
 
 <screen><userinput>sed -i '217s@set@this->set@' src/botantools/botan/botan/secmem.h &amp;&amp;
-./configure --prefix=&qt-dir; \
+./configure --prefix=&qt4-dir; \
             --certstore-path=/etc/ssl/ca-bundle.crt &amp;&amp;
 make</userinput></screen>
@@ -124 +124 @@
         <seg>qcatool2 and qcatool2.debug</seg>
         <seg>libqca.so and libqca.so.&qca-version;.debug</seg>
-        <seg>&qt-dir;/include/QtCrypto and &qt-dir;/share/qca</seg>
+        <seg>&qt4-dir;/include/QtCrypto and &qt4-dir;/share/qca</seg>
       </seglistitem>
     </segmentedlist>

general/genlib/qjson.xml

@@ -75 +75 @@
     <bridgehead renderas="sect4">Required</bridgehead>
     <para role="required">
-      <xref linkend="qt"/> and
+      <xref linkend="qt4"/> and
       <xref linkend="cmake"/>
     </para>    
@@ -94 +94 @@
 <screen><userinput>mkdir build &amp;&amp;
 cd build &amp;&amp;
-cmake -DCMAKE_INSTALL_PREFIX=&qt-dir; \
+cmake -DCMAKE_INSTALL_PREFIX=&qt4-dir; \
       -DCMAKE_BUILD_TYPE=Release \
       .. &amp;&amp;
@@ -126 +126 @@
         </seg>
         <seg>
-          &qt-dir;/include/json and &qt-dir;/lib/cmake/qjson
+          &qt4-dir;/include/json and &qt4-dir;/lib/cmake/qjson
         </seg>
       </seglistitem>