Changeset ad41452 for x


Ignore:
Timestamp:
04/15/2012 05:19:58 PM (12 years ago)
Author:
Ragnar Thomsen <rthomsen@…>
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:
1bc70b56
Parents:
86f9469
Message:

Fix Qca compile with GCC4.7. QTDIR variable.

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

File:
1 edited

Legend:

Unmodified
Added
Removed

  • x/lib/qt4.xml

    r86f9469 rad41452  
    2828
    2929  <sect2 role="package">
    30     <title>Introduction to Qt4</title>
     30    <title>Introduction to Qt</title>
    3131
    3232    <para><application>Qt</application> is a cross-platform application
    … …  
    3535    as a widget toolkit), and also used for developing non-GUI programs such
    3636    as command-line tools and consoles for servers. One of the major users
    37     of <application>Qt4</application> is <application>KDE</application>.</para>
     37    of <application>Qt</application> is <application>KDE</application>.</para>
    3838
    3939    &lfs71_checked;   
    … …  
    112112
    113113  <sect2 role="installation">
    114     <title>Installation of Qt4</title>
     114    <title>Installation of Qt</title>
    115115
    116116    <para>There are several ways to install a complicated package such as
    117     <application>Qt4</application>. The files are not completely position
     117    <application>Qt</application>. The files are not completely position
    118118    independent. Installation procedures execute the program
    119119    <command>pkg-config</command> to determine the location of package
    120120    executables, libraries, headers, and other files. For
    121     <application>Qt4</application>, <command>pkg-config</command> will look
     121    <application>Qt</application>, <command>pkg-config</command> will look
    122122    for the appropriate <filename>lib/pkgconfig/Qt*.pc</filename> files which
    123123    must be modified if relocating the package. These files are set up correctly
    … …  
    136136    <filename class='directory'>/usr</filename> hierarchy.
    137137    This is the method that most commercial distributions use.</para>
    138 <!--
    139     <note>
    140       <para>There is no conflict between the <application>Qt3</application>
    141       and <application>Qt4</application> applications and headers so both
    142       can be installed at the same time.  This may be necessary to build or
    143       run Qt3 applications like <application>KDE3</application> and
    144       <application>Qt4</application> applications like
    145       <application>Doxygen</application>'s <application>doxywizard</application>
    146       on the same system.
    147       </para>
    148 
    149       <para>To set up both <application>Qt3</application> and
    150       <application>Qt4</application> on the same system, choose the primary
    151       version for the <filename>/opt/qt</filename> symbolic link and add
    152       the explicit library directory of the other version to
    153       <filename>/etc/ld.so.conf</filename>.</para>
    154 
    155       <para>On a system with both versions of Qt, there is a name conflict with
    156       Qt applications such as <filename>qmake</filename>,
    157       <filename>assistant</filename>, and <filename>designer</filename>.  In
    158       such a case, make sure the PATH variable lists the proper
    159       <filename>/opt/qt&lt;version&gt;/bin</filename> directory before the
    160       other Qt bin directory.  </para>
    161     </note>
    162 -->
     138
    163139    <caution>
    164       <para>If <application>Qt4</application> is being reinstalled and the
     140      <para>If <application>Qt</application> is being reinstalled and the
    165141      <filename class='directory'>/usr</filename>
    166142      directory is used as the prefix, run the following commands from a
    167       console or non-Qt4 based window manager.  It overwrites
    168       <application>Qt4</application> libraries that should not be in use during
     143      console or non-Qt based window manager.  It overwrites
     144      <application>Qt</application> libraries that should not be in use during
    169145      the install process.</para>
    170146    </caution>
    … …  
    172148    <note>
    173149      <para>The build time and space required for the full
    174       <application>Qt4</application> is quite long.  The instructions below do
     150      <application>Qt</application> is quite long.  The instructions below do
    175151      not build the tutorials and examples.  Removing the
    176152      <parameter>-nomake</parameter> lines will create a complete build.</para>
    177153    </note>
    178154
    179     <para>The method recommended by the <application>Qt4</application>
     155    <para>The method recommended by the <application>Qt</application>
    180156    developers does not use the /usr directory prefix. It has the advantage of
    181157    keeping all the package files consolidated in a dedicated directory
    … …  
    184160    by changing one symbolic link.</para>
    185161
    186     <para>The <application>Qt4</application> developers use a default location
     162    <para>The <application>Qt</application> developers use a default location
    187163    of <filename class='directory'>/usr/local/qt/</filename>, however the
    188164    procedure below puts the files in <filename
    … …  
    190166    and then creates a symbolic link to <filename>/opt/qt/</filename>.</para>
    191167   
    192     <para>Configure <application>Qt4</application> by running the
     168    <para>Configure <application>Qt</application> by running the
    193169    following commands:</para>
    194170
    … …  
    220196<screen role="root"><userinput>make install</userinput></screen>
    221197
    222     <para>If you installed <application>Qt4</application> in the /opt directory,
     198    <para>If you installed <application>Qt</application> in the /opt directory,
    223199    again as the <systemitem class="username">root</systemitem> user issue:</para>
    224200
    … …  
    245221    <para><parameter>-nomake examples, -nomake demos</parameter>:
    246222    These switches disable building programs that are only of interest
    247     to a <application>Qt4</application> developer.</para>
     223    to a <application>Qt</application> developer.</para>
    248224   
    249225    <para><parameter>-system-sqlite</parameter>:
    … …  
    261237    <para><parameter>-plugin-sql-<replaceable>&lt;driver&gt;</replaceable></parameter>
    262238    or <parameter>-qt-sql-<replaceable>&lt;driver&gt;</replaceable></parameter>:
    263     These switches build SQL support into the <application>Qt4</application>
     239    These switches build SQL support into the <application>Qt</application>
    264240    libraries.</para>
    265241
    … …  
    280256
    281257  <sect2 role="configuration">
    282     <title>Configuring Qt4</title>
     258    <title>Configuring Qt</title>
    283259
    284260    <sect3 id='qt4-config'>
    285261      <title>Configuration Information</title>
    286262
    287       <para>If you installed <application>Qt4</application> in a location other
     263      <para>If you installed <application>Qt</application> in a location other
    288264      than /usr, you also need to update the following configuration files so
    289       that <application>Qt4</application> is correctly found by other packages
     265      that <application>Qt</application> is correctly found by other packages
    290266      and system processes.</para>
    291267
    … …  
    295271
    296272<screen role="root"><userinput>cat &gt;&gt; /etc/ld.so.conf &lt;&lt; "EOF" &amp;&amp;
    297 <literal># Begin qt addition
     273<literal># Begin Qt addition
    298274
    299275/opt/qt/lib
    300276
    301 # End qt addition</literal>
     277# End Qt addition</literal>
    302278EOF
    303279ldconfig</userinput></screen>
    … …  
    308284
    309285      <para>As the <systemitem class="username">root</systemitem> user, create
    310       the <filename>/etc/profile.d/qt4.sh</filename> file:</para>
    311 
    312 <screen role="root"><userinput>cat &gt; /etc/profile.d/qt4.sh &lt;&lt; "EOF"
    313 # Begin /etc/profile.d/qt4.sh
    314 
    315 QT4DIR=/opt/qt
     286      the <filename>/etc/profile.d/qt.sh</filename> file:</para>
     287
     288<screen role="root"><userinput>cat &gt; /etc/profile.d/qt.sh &lt;&lt; "EOF"
     289# Begin /etc/profile.d/qt.sh
     290
    316291QTDIR=/opt/qt
    317292
    … …  
    319294pathappend /opt/qt/lib/pkgconfig PKG_CONFIG_PATH
    320295
    321 export QT4DIR QTDIR
    322 
    323 # End /etc/profile.d/qt4.sh
     296export QTDIR
     297
     298# End /etc/profile.d/qt.sh
    324299EOF</userinput></screen>
    325300     
Note: See TracChangeset for help on using the changeset viewer.