Changeset ad41452


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, 12.2, 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, gimp3, 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/for-12.3, xry111/intltool, xry111/llvm18, xry111/soup3, xry111/spidermonkey128, 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

Files:
14 edited

Legend:

Unmodified
Added
Removed

  • general.ent

    r86f9469 rad41452  
    606606<!ENTITY qt-version                   "3.3.8d">
    607607<!ENTITY qt4-version                  "4.8.1">
     608<!ENTITY qt-dir                       "$QTDIR">
    608609<!ENTITY cairo-version                "1.12.0">
    609610<!ENTITY cairomm-version              "1.9.2">

  • general/genlib/libdbusmenuqt.xml

    r86f9469 rad41452  
    9292<screen><userinput>mkdir build &amp;&amp;
    9393cd build &amp;&amp;
    94 cmake -DCMAKE_INSTALL_PREFIX=$QT4DIR \
     94cmake -DCMAKE_INSTALL_PREFIX=&qt-dir; \
    9595      -DWITH_DOC=OFF .. &amp;&amp;
    9696make</userinput></screen>
    … …  
    122122        <seg>None</seg>
    123123        <seg>libdbusmenu-qt.so</seg>
    124         <seg>$QT4DIR/include/dbusmenu-qt</seg>
     124        <seg>&qt-dir;/include/dbusmenu-qt</seg>
    125125      </seglistitem>
    126126    </segmentedlist>

  • general/genlib/qca.xml

    r86f9469 rad41452  
    88  <!ENTITY qca-download-ftp  " ">
    99  <!ENTITY qca-md5sum        "fc15bd4da22b8096c51fcfe52d2fa309">
    10   <!ENTITY qca-size          "4.5 MB">
    11   <!ENTITY qca-buildsize     "89 MB">
     10  <!ENTITY qca-size          "4.3 MB">
     11  <!ENTITY qca-buildsize     "110 MB">
    1212  <!ENTITY qca-time          "2.2 SBU">
    1313]>
    … …  
    2828
    2929  <sect2 role="package">
    30     <title>Introduction to QCA</title>
     30    <title>Introduction to Qca</title>
    3131
    32     <para><application>QCA</application> aims to provide a straightforward
    33     and cross-platform crypto API, using <application>Qt4</application> datatypes
    34     and conventions. <application>QCA</application> separates the API from
     32    <para><application>Qca</application> aims to provide a straightforward
     33    and cross-platform crypto API, using <application>Qt</application> datatypes
     34    and conventions. <application>Qca</application> separates the API from
    3535    the implementation, using plugins known as Providers.</para>
    3636
    37     &lfs67_checked;
     37    &lfs71_checked;
    3838
    3939    <bridgehead renderas="sect3">Package Information</bridgehead>
    … …  
    6868    </itemizedlist>
    6969-->
    70     <bridgehead renderas="sect3">qca Dependencies</bridgehead>
     70    <bridgehead renderas="sect3">Qca Dependencies</bridgehead>
    7171
    7272    <bridgehead renderas="sect4">Required</bridgehead>
    … …  
    8282
    8383  <sect2 role="installation">
    84     <title>Installation of QCA</title>
     84    <title>Installation of Qca</title>
    8585
    86     <para>Install <application>qca</application> by running the following
     86    <para>Install <application>Qca</application> by running the following
    8787    commands:</para>
    8888
    89 <screen><userinput>./configure --prefix=$(pkg-config --variable=prefix QtCore) &amp;&amp;
     89<screen><userinput>sed -i '217s@set@this->set@' src/botantools/botan/botan/secmem.h &amp;&amp;
     90./configure --prefix=&qt-dir; &amp;&amp;
    9091make</userinput></screen>
    9192
    … …  
    9596
    9697  </sect2>
    97 <!--
     98
    9899  <sect2 role="commands">
    99100    <title>Command Explanations</title>
    100101
    101     <para><option>- -xyz</option>: This option is set for ...</para>
     102    <para><command>sed -i '217s@set@...</command>: This sed fixes compiling with
     103    <application>GCC</application> 4.7. It is safe to omit when compiling with
     104    older <application>GCC</application> versions.</para>
    102105
    103106  </sect2>
    104 -->
     107
    105108  <sect2 role="content">
    106109    <title>Contents</title>
    107110
    108111    <segmentedlist>
    109       <segtitle>Installed Program</segtitle>
     112      <segtitle>Installed Programs</segtitle>
    110113      <segtitle>Installed Libraries</segtitle>
    111       <segtitle>Installed Directory</segtitle>
     114      <segtitle>Installed Directories</segtitle>
    112115
    113116      <seglistitem>
    114         <seg>None</seg>
    115         <seg>libqca.so</seg>
    116         <seg>$QT4DIR/share/qca</seg>
     117        <seg>qcatool2 and qcatool2.debug</seg>
     118        <seg>libqca.so and libqca.so.&qca-version;.debug</seg>
     119        <seg>&qt-dir;/include/QtCrypto and &qt-dir;/share/qca</seg>
    117120      </seglistitem>
    118121    </segmentedlist>

  • general/prog/doxygen.xml

    r86f9469 rad41452  
    9191    <note><para>If you have both <xref linkend='qt'/> and <xref linkend='qt4'/>
    9292    installed, be sure to set the environment variable QTDIR to point to the
    93     <application>Qt4</application> top level directory if you add the
     93    <application>Qt</application> top level directory if you add the
    9494    <option>- -with-doxywizard</option> option.</para></note> -->
    9595
    … …  
    123123
    124124    <para><option>--with-doxywizard</option>: Use this parameter if
    125     <application>Qt4</application> is installed and you wish to build the
     125    <application>Qt</application> is installed and you wish to build the
    126126    GUI front-end.</para>
    127127

  • introduction/welcome/changelog.xml

    r86f9469 rad41452  
    4646      <itemizedlist>
    4747        <listitem>
    48           <para>[rthomsen] - Added sed for compiling Strigi with GCC 4.7.</para>
     48          <para>[rthomsen] - Replace the use of the $QT4DIR variable with
     49          $QTDIR, since only one version of Qt is currently in the book.</para>
     50        </listitem>
     51        <listitem>
     52          <para>[rthomsen] - Added sed for compiling Qca with GCC 4.7. Thanks
     53          to Pierre Labastie for the report.</para>
     54        </listitem>
     55        <listitem>
     56          <para>[rthomsen] - Added sed for compiling Strigi with GCC 4.7. Thanks
     57          to Pierre Labastie for the report.</para>
    4958        </listitem>
    5059        <listitem>

  • kde4/core/akonadi.xml

    r86f9469 rad41452  
    9393<screen><userinput>mkdir build &amp;&amp;
    9494cd build &amp;&amp;
    95 CMAKE_PREFIX_PATH=$QT4DIR \
     95CMAKE_PREFIX_PATH=&qt-dir; \
    9696      cmake -DCMAKE_INSTALL_PREFIX=&kde-dir; .. &amp;&amp;
    9797make</userinput></screen>
    … …  
    106106    <title>Command Explanations</title>
    107107
    108     <para><option>CMAKE_PREFIX_PATH=$QT4DIR</option>: This option is set to find automoc4.</para>
     108    <para><option>CMAKE_PREFIX_PATH=&qt-dir;</option>: This option is set to find automoc4.</para>
    109109
    110110  </sect2>

  • kde4/core/automoc4.xml

    r86f9469 rad41452  
    3131
    3232    <para><application>Automoc4</application> is a tool to add rules for generating
    33     <application>Qt4</application> moc files automatically to projects that use
     33    <application>Qt</application> moc files automatically to projects that use
    3434    <application>CMake</application> as the buildsystem.</para>
    3535
    … …  
    8989<screen><userinput>mkdir build &amp;&amp;
    9090cd build &amp;&amp;
    91 cmake -DCMAKE_INSTALL_PREFIX=$QT4DIR \
     91cmake -DCMAKE_INSTALL_PREFIX=&qt-dir; \
    9292      .. &amp;&amp;
    9393make</userinput></screen>
    … …  
    129129        <term><command>automoc4</command></term>
    130130        <listitem>
    131           <para>is a utility generating <application>Qt4</application> moc
     131          <para>is a utility generating <application>Qt</application> moc
    132132          files.</para>
    133133          <indexterm zone="a-automoc4 automoc4">

  • kde4/core/config.xml

    r86f9469 rad41452  
    7070    <title>Installing further KDE packages</title>
    7171    <para>Every subsequent package can be built while having <application>KDE</application> up and
    72     running, but remember to keep <envar>&kde-dir;</envar> and <envar>$QT4DIR</envar> set.</para>
     72    running, but remember to keep <envar>&kde-dir;</envar> and <envar>&qt-dir;</envar> set.</para>
    7373  </sect2>
    7474   

  • kde4/core/phonon.xml

    r86f9469 rad41452  
    9999<screen><userinput>mkdir build &amp;&amp;
    100100cd build &amp;&amp;
    101 cmake -DCMAKE_INSTALL_PREFIX=$QT4DIR \
     101cmake -DCMAKE_INSTALL_PREFIX=&qt-dir; \
    102102      -DPHONON_INSTALL_QT_EXTENSIONS_INTO_SYSTEM_QT=TRUE \
    103103      .. &amp;&amp;
    … …  
    113113    <title>Command Explanations</title>
    114114
    115     <para><option>-DPHONON_INSTALL_QT_EXTENSIONS_INTO_SYSTEM_QT=TRUE</option>: This option ensures that the plugins and mkspecs files get installed in the correct location.</para>
     115    <para><option>-DPHONON_INSTALL_QT_EXTENSIONS_INTO_SYSTEM_QT=TRUE</option>:
     116    This option ensures that the plugins and mkspecs files get installed in
     117    the correct location.</para>
    116118
    117119  </sect2>
    … …  
    122124       
    123125<screen><userinput>sed -i -e 's#{includedir}$#&amp; -I\${includedir}/phonon#' \
    124           $QT4DIR/lib/pkgconfig/phonon.pc</userinput></screen>
     126          &qt-dir;/lib/pkgconfig/phonon.pc</userinput></screen>
    125127-->
    126128
    … …  
    137139
    138140    <segmentedlist>
    139       <segtitle>Installed Program</segtitle>
     141      <segtitle>Installed Programs</segtitle>
    140142      <segtitle>Installed Libraries</segtitle>
    141       <segtitle>Installed Directory</segtitle>
     143      <segtitle>Installed Directories</segtitle>
    142144
    143145      <seglistitem>
    144146        <seg>none</seg>
    145         <seg>libphonon.so, libphononexperimental.so</seg>
     147        <seg>libphonon.so and libphononexperimental.so</seg>
    146148        <seg>none</seg>
    147149      </seglistitem>

  • kde4/core/polkit-qt.xml

    r86f9469 rad41452  
    8888<screen><userinput>mkdir build &amp;&amp;
    8989cd build &amp;&amp;
    90 CMAKE_PREFIX_PATH=$QT4DIR \
     90CMAKE_PREFIX_PATH=&qt-dir; \
    9191      cmake -DCMAKE_INSTALL_PREFIX=&kde-dir; .. &amp;&amp;
    9292make</userinput></screen>
    … …  
    101101    <title>Command Explanations</title>
    102102
    103     <para><option>CMAKE_PREFIX_PATH=$QT4DIR</option>: This option is set to find automoc4</para>
     103    <para><option>CMAKE_PREFIX_PATH=&qt-dir;</option>: This option is set to find automoc4</para>
    104104
    105105  </sect2>

  • kde4/intro/kde4-intro.xml

    r86f9469 rad41452  
    1818  <para><application>KDE</application> version 4 is a comprehensive desktop
    1919  environment with a huge number of applications written for it and a huge
    20   amount of users. It is based on the <application>Qt4</application> framework.</para>
     20  amount of users. It is based on the <application>Qt</application> framework.</para>
    2121  <para>For more information visit the official KDE project site at <ulink
    2222  url="http://www.kde.org/"/>.</para>

  • kde4/intro/pre-install-config.xml

    r86f9469 rad41452  
    132132    </tip>
    133133
    134   <!-- Moved to QT4
    135   <sect2><title>The QT4DIR variable</title>
    136  
    137   <para>Some additional packages which are based on
    138   <application>Qt4</application> will be installed. One of them is
    139   <application>Phonon</application>, a direct replacement of the implementation
    140   which comes with <application>Qt4</application>.  It's recommended placing
    141   such libraries in the same hierarchy where <application>Qt4</application>
    142   itself resides. Later on, it is refered to as <envar>QT4DIR</envar>. If you have
    143   placed <application>Qt4</application> in <filename
    144   class='directory'>/usr</filename>, set <envar>QT4DIR</envar>:</para>
    145  
    146 <screen><userinput>export QT4DIR=/usr</userinput></screen>
    147 
    148   <para>Alternativly, <application>Qt4</application> is often placed in the
    149   <filename class='directory'>/opt</filename> hierarchy:</para>
    150  
    151 <screen><userinput>export QT4DIR=/opt/qt-&qt4-version;
    152 export PATH=$QT4DIR/bin:$PATH</userinput></screen>
    153 -->
    154134  </sect2>
    155135</sect1>

  • networking/netutils/avahi.xml

    r86f9469 rad41452  
    159159    <para><parameter>--disable-qt4</parameter>: This parameter disables the
    160160    building of <application>Qt4Core</application> mainloop integration. Omit
    161     this if you have installed <application>Qt4</application>.</para>
     161    this if you have installed <application>Qt</application>.</para>
    162162
    163163    <para><parameter>--enable-core-docs</parameter>: This parameter enables the

  • 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.