Changeset 45ad0e4f for x

Timestamp:

04/21/2005 04:33:47 AM (19 years ago)

Author:

Bruce Dubbs <bdubbs@…>

Branches:

10.0, 10.1, 11.0, 11.1, 11.2, 11.3, 12.0, 12.1, 6.1, 6.2, 6.2.0, 6.2.0-rc1, 6.2.0-rc2, 6.3, 6.3-rc1, 6.3-rc2, 6.3-rc3, 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:

8b82ddf

Parents:

44edf870

Message:

Updated qt. Removed extra copy commands and fixed qmake.conf modification to eliminate qt application build errors.

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

File:

• x/lib/qt.xml (modified) (5 diffs)

x/lib/qt.xml

@@ -107 +107 @@
 This is the method that most commercial distributions use.</para>
 
-<screen><userinput><command>sed -i -e 's:cp -f:install:' \
-       -e 's:$(QTDIR)/include:&amp;/qt:' \
+<note><para>If qt is being reinstalled, run the following commands from
+a console or non-qt based window manager.  It overwrites qt libraries 
+that should not be in use durring the install process.</para></note>
+
+<screen><userinput><command>sed -i -e 's:$(QTDIR)/include:&amp;/qt:' \
        -e 's:$(QTDIR)/lib:&amp;/qt:' \
        mkspecs/linux*/qmake.conf   &amp;&amp;    
@@ -127 +130 @@
 <screen><userinput role='root'><command>make install &amp;&amp;
 ln -sf libqt-mt.so /usr/lib/libqt.so &amp;&amp;
-rm /usr/bin/qmake &amp;&amp;
-install -m755 -oroot -groot qmake/qmake /usr/bin &amp;&amp;
 cp -r doc/man /usr/share &amp;&amp;
 cp -r examples /usr/share/doc/qt</command></userinput></screen>
@@ -165 +166 @@
 ln -sfn qt-&qt-version; /opt/qt &amp;&amp;
 ln -s libqt-mt.so /opt/qt/lib/libqt.so &amp;&amp;
-rm /opt/qt-&qt-version;/bin/qmake &amp;&amp;
-install -m755 -oroot -groot qmake/qmake /opt/qt-&qt-version;/bin &amp;&amp;
 cp -r doc/man /opt/qt/doc &amp;&amp;
 cp -r examples /opt/qt/doc</command></userinput></screen>
@@ -185 +184 @@
 <title>Command explanations</title>
 
-<para><command>sed -i -e 's:cp -f:install:'
-       -e 's:$(QTDIR)/include:&amp;/qt:' 
+<para><command>sed -i -e 's:$(QTDIR)/include:&amp;/qt:' 
        -e 's:$(QTDIR)/lib:&amp;/qt:' 
        mkspecs/linux*/qmake.conf</command>: 
-<command>install</command> is safer than <command>cp</command> when
-libraries are in use.  Also, directories need to be adjusted to match
+Directories in qmake.conf need to be adjusted to match
 the BLFS Method 1 installation directories.</para>
 
@@ -232 +229 @@
 allows <command>configure</command> scripts to find a working 
 <application>Qt</application> installation.</para>
-
-<para><command>rm .../qmake; install -m755 -oroot -groot qmake/qmake .../bin</command>: 
-The <command>qmake</command> program is installed incorrectly by 
-<command>make install</command>. These two commands install the program
-correctly.</para>
 
 <para><command>cp -r doc/man /usr/share (or /opt/qt/doc)</command>: This command