Changeset 1afe6c26


Ignore:
Timestamp:
06/08/2007 03:47:39 AM (17 years ago)
Author:
Dan Nichilson <dnicholson@…>
Branches:
10.0, 10.1, 11.0, 11.1, 11.2, 11.3, 12.0, 12.1, 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:
36474cb
Parents:
048bc8cc
Message:

Changed the Qt install so all files accessible from QTDIR=/usr/share/qt

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

Files:
3 edited

Legend:

Unmodified
Added
Removed

  • general.ent

    r048bc8cc r1afe6c26  
    44-->
    55
    6 <!ENTITY day          "31">                   <!-- Always 2 digits -->
    7 <!ENTITY month        "05">                   <!-- Always 2 digits -->
     6<!ENTITY day          "07">                   <!-- Always 2 digits -->
     7<!ENTITY month        "06">                   <!-- Always 2 digits -->
    88<!ENTITY year         "2007">
    99<!ENTITY version      "svn-&year;&month;&day;">
    10 <!ENTITY releasedate  "May &day;st, &year;">
     10<!ENTITY releasedate  "June &day;th, &year;">
    1111<!ENTITY pubdate      "&year;-&month;-&day;"> <!-- metadata req. by TLDP -->
    1212<!ENTITY blfs-version "svn">                  <!-- svn|[release #] -->

  • introduction/welcome/changelog.xml

    r048bc8cc r1afe6c26  
    4343
    4444    <listitem>
     45      <para>June 7th, 2007</para>
     46      <itemizedlist>
     47        <listitem>
     48          <para>[dnicholson] - Changed the Qt /usr install with symlinks to
     49          the bin, include and lib directories in /usr/share/qt.</para>
     50        </listitem>
     51      </itemizedlist>
     52    </listitem>
     53
     54    <listitem>
    4555      <para>May 31st, 2007</para>
    4656      <itemizedlist>

  • x/lib/qt.xml

    r048bc8cc r1afe6c26  
    186186    <para>Continue with:</para>
    187187
    188 <screen><userinput>sed -i -e 's:$(QTDIR)/include:&amp;/qt:' \
    189        -e 's:$(QTDIR)/lib:&amp;/qt:' \
    190     mkspecs/linux*/qmake.conf &amp;&amp;
     188<screen><userinput>sed -i '/QMAKE_RPATH/d' mkspecs/linux*/qmake.conf &amp;&amp;
    191189
    192190bash
    … …  
    213211            -tablet &amp;&amp;
    214212
    215 find -type f -name Makefile | xargs sed -i "s@-Wl,-rpath,/usr/lib@@g" &amp;&amp;
    216213make &amp;&amp;
    217214exit</userinput></screen>
    … …  
    224221<screen role="root"><userinput>make install &amp;&amp;
    225222ln -v -sf libqt-mt.so /usr/lib/libqt.so &amp;&amp;
     223ln -v -snf ../../bin /usr/share/qt/bin &amp;&amp;
     224ln -v -snf ../../include/qt /usr/share/qt/include &amp;&amp;
     225ln -v -snf ../../lib /usr/share/qt/lib &amp;&amp;
    226226cp -v -r doc/man /usr/share &amp;&amp;
    227227cp -v -r examples /usr/share/doc/qt</userinput></screen>
    … …  
    294294    <title>Command Explanations</title>
    295295
    296     <para><command>sed -i -e ... mkspecs/linux*/qmake.conf</command>:
    297     Directories in <filename>qmake.conf</filename> need to be adjusted
    298     to match the BLFS Method 1 installation directories.</para>
     296    <para><command>sed -i '/QMAKE_RPATH/d' mkspecs/linux*/qmake.conf</command>:
     297    In Method 1, <application>Qt</application> is being installed into
     298    the standard system directories. The runtime library search path does not
     299    need to be set in this case.</para>
    299300
    300301    <para><command>bash</command>: This command enters a sub-shell to isolate
    … …  
    348349    support for multi-threading.</para>
    349350
    350     <para><command>find -type f -name Makefile | xargs sed -i
    351     "s@-Wl,-rpath,/usr/lib@@g"</command>: This command removes hardcoded
    352     run-time paths. Otherwise, <command>uic</command> always tries to run
    353     with <application>Qt</application> libraries in
    354     <filename>/usr/lib</filename>.</para>
    355 
    356     <para><command>ln -v -s libqt-mt.so /usr/lib/libqt.so</command>: This
     351    <para><command>ln -v -sf libqt-mt.so /usr/lib/libqt.so</command>: This
    357352    command allows <command>configure</command> scripts to find a working
    358353    <application>Qt</application> installation.</para>
     354
     355    <para><command>ln -v -snf ../../bin /usr/share/qt/bin</command>: This
     356    command and the following two allow the
     357    <filename class="directory">/usr</filename> style installation to mimic
     358    the <filename class="directory">/opt</filename> style installation by
     359    making all binaries, headers and libraries available from a single
     360    directory, <filename class="directory">/usr/share/qt</filename>.</para>
    359361
    360362    <para><command>cp -v -r doc/man examples /usr/share (or
    … …  
    382384
    383385      <para>For Method 1 (This is optional, only set this if an application is
    384       unable to find the installed libraries):</para>
    385 
    386 <screen><literal>export QTDIR=/usr</literal></screen>
     386      unable to find the installed libraries or headers):</para>
     387
     388<screen><literal>export QTDIR=/usr/share/qt</literal></screen>
    387389
    388390      <para>or for Method 2:</para>
Note: See TracChangeset for help on using the changeset viewer.