Changeset 57a6033 for x

Timestamp:

09/22/2015 03:00:47 PM (9 years ago)

Author:

Pierre Labastie <pieere@…>

Branches:

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

Children:

789c1b9

Parents:

7fab6275

Message:

Fix qt4-5 instructions:

• add environment variables for qtwebkit build
• enclose qtwebkit instrucitons between pushd-popd
• add quotes to some here documents
• typo in phonon

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

Location:

x/lib

Files:

• qt4.xml (modified) (5 diffs)
• qt5.xml (modified) (1 diff)

x/lib/qt4.xml

@@ -177 +177 @@
       </para>
 
-<screen role="root"><userinput>mkdir /opt/qt-&qt4-version;
+<screen role="root"><userinput>mkdir -pv /opt/qt-&qt4-version;
 ln -sfnv qt-&qt4-version; /opt/qt4</userinput></screen>
 
@@ -311 +311 @@
 
 <screen><userinput>mkdir qtwebkit-&wk-version; &amp;&amp;
-cd    qtwebkit-&wk-version; &amp;&amp;
+pushd qtwebkit-&wk-version; &amp;&amp;
 
 tar -xf ../../qtwebkit-&wk-version;.tar.gz             &amp;&amp;
 patch -Np1 -i ../../qtwebkit-&wk-version;-gcc5-1.patch &amp;&amp;
 
-Tools/Scripts/build-webkit --qt --no-webkit2 --prefix=$QT4PREFIX</userinput></screen>
+QTDIR=$QT4PREFIX PATH=$PATH:$QT4PREFIX/bin \
+Tools/Scripts/build-webkit --qt            \
+                           --no-webkit2    \
+                           --prefix=$QT4PREFIX</userinput></screen>
 
    <para>If desired, the build process can use parallel processors by
@@ -329 +332 @@
 
     <bridgehead renderas="sect3">Installing Auxillary Files</bridgehead>
+
+    <para>
+      The following instructions assume that your working directory is the top
+      of the <application>Qt4</application> source tree:
+    </para>
+
+<screen><userinput>popd</userinput></screen>
 
     <para>
@@ -516 +526 @@
       </para>
 
-<screen role="root"><userinput>cat &gt; /etc/profile.d/qt4.sh &lt;&lt; EOF
+<screen role="root"><userinput>cat &gt; /etc/profile.d/qt4.sh &lt;&lt; "EOF"
 <literal># Begin /etc/profile.d/qt4.sh
 
@@ -556 +566 @@
    </para>
 
-<screen role="root"><userinput>cat &gt; /etc/profile.d/qt4.sh &lt;&lt; EOF
+<screen role="root"><userinput>cat &gt; /etc/profile.d/qt4.sh &lt;&lt; "EOF"
 <literal># Begin /etc/profile.d/qt4.sh
 

x/lib/qt5.xml

@@ -487 +487 @@
       </para>
 
-<screen role="root"><userinput>cat &gt; /etc/profile.d/qt5.sh &lt;&lt; EOF
+<screen role="root"><userinput>cat &gt; /etc/profile.d/qt5.sh &lt;&lt; "EOF"
 <literal># Begin /etc/profile.d/qt5.sh