Changeset ad41452 for general


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

Location:
general
Files:
3 edited

Legend:

Unmodified
Added
Removed

  • 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
Note: See TracChangeset for help on using the changeset viewer.