Changeset c4dd285f


Ignore:
Timestamp:
01/25/2016 03:56:13 AM (8 years ago)
Author:
DJ Lucas <dj@…>
Branches:
systemd-13485
Children:
99673f0
Parents:
f587275
Message:

partial cleanup of -systemd.xml files

git-svn-id: svn://svn.linuxfromscratch.org/BLFS/branches/systemd@16839 af4574ff-66df-0310-9fd7-8a98e5e911e0

Location:
general/genlib
Files:
2 deleted
5 edited

Legend:

Unmodified
Added
Removed

  • general/genlib/genlib.xml

    rf587275 rc4dd285f  
    7373  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="libdaemon.xml"/>
    7474  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="libdbusmenuqt.xml"/>
    75   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="libdrm-systemd.xml"/>
     75  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="libdrm.xml"/>
    7676  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="libesmtp.xml"/>
    7777  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="libevdev-systemd.xml"/>
    … …  
    8181  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="libgsf.xml"/>
    8282  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="libgudev.xml"/>
    83   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="libgusb-systemd.xml"/>
     83  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="libgusb.xml"/>
    8484  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="libical.xml"/>
    8585  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="libidn.xml"/>
    … …  
    114114  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="pth.xml"/>
    115115  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="ptlib.xml"/>
    116   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="qca-systemd.xml"/>
     116  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="qca.xml"/>
    117117  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="qjson.xml"/>
    118118  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="talloc.xml"/>

  • general/genlib/libdrm-systemd.xml

    rf587275 rc4dd285f  
    77  <!ENTITY libdrm-download-http "http://dri.freedesktop.org/libdrm/libdrm-&libdrm-version;.tar.bz2">
    88  <!ENTITY libdrm-download-ftp  " ">
    9   <!ENTITY libdrm-md5sum        "de49916e5f8aef4eba55223c79709b05">
    10   <!ENTITY libdrm-size          "632 KB">
    11   <!ENTITY libdrm-buildsize     "15 MB (with tests)">
    12   <!ENTITY libdrm-time          "0.2 SBU (additional 0.8 SBU for tests)">
     9  <!ENTITY libdrm-md5sum        "c6809c48538d6e5999588832045ff014">
     10  <!ENTITY libdrm-size          "680 KB">
     11  <!ENTITY libdrm-buildsize     "17 MB (with tests)">
     12  <!ENTITY libdrm-time          "0.8 SBU (with tests)">
    1313]>
    1414
    … …  
    1717
    1818  <sect1info>
    19     <othername>$LastChangedBy: krejzi $</othername>
    20     <date>$Date: 2014-10-27 19:51:53 +0100 (Mon, 27 Oct 2014) $</date>
     19    <othername>$LastChangedBy: fernando $</othername>
     20    <date>$Date: 2015-12-28 12:21:27 -0600 (Mon, 28 Dec 2015) $</date>
    2121  </sect1info>
    2222
    … …  
    3838    </para>
    3939
    40     &lfs77_checked;
     40    &lfs78_checked;
    4141
    4242    <bridgehead renderas="sect3">Package Information</bridgehead>
    … …  
    7878    <bridgehead renderas="sect4">Recommended</bridgehead>
    7979    <para role="recommended">
    80       <xref linkend="libpciaccess"/> (for Intel KMS API support required by Mesa)
     80      <xref linkend="xorg7-lib"/> (for Intel KMS API support required by Mesa) <!-- libpciaccess -->
    8181    </para>
    8282
    8383    <bridgehead renderas="sect4">Optional</bridgehead>
    8484    <para role="optional">
    85       <xref linkend="cairo"/> (for the testsuite),
    8685      <xref linkend="DocBook"/>,
    8786      <xref linkend="docbook-xsl"/> and
    … …  
    103102    </para>
    104103
    105 <screen><userinput>sed -e "/pthread-stubs/d" -i configure.ac &amp;&amp;
    106 autoreconf -fi &amp;&amp;
    107 ./configure --prefix=/usr --enable-udev --disable-valgrind &amp;&amp;
     104<screen><userinput>sed -e "/pthread-stubs/d" \
     105    -i configure.ac &amp;&amp;
     106autoreconf -fiv     &amp;&amp;
     107
     108./configure --prefix=/usr --enable-udev &amp;&amp;
     109
    108110make</userinput></screen>
    109111
    110112    <para>
    111       To check the results, issue <command>make check</command>.
     113      To check the results, issue <command>make check</command>. Tests may hang
     114      for unknown reasons. If nouveau threaded test hangs, you can disable it
     115      with
     116      <command>sed -i 's/^TESTS/#&amp;/' tests/nouveau/Makefile.in</command>.
    112117    </para>
    113118
    … …  
    130135
    131136    <para>
    132       <parameter>--disable-valgrind</parameter>: This parameter remvoes a hard
    133       dependency on Valgrind.
    134     </para>
    135 
    136     <para>
    137137      <parameter>--enable-udev</parameter>: This parameter enables support for using
    138138      <application>Udev</application> instead of <command>mknod</command>.
    139139    </para>
     140<!--
     141    <para>
     142      <parameter>-\-disable-valgrind</parameter>: This parameter fixes a hard dependency on
     143      <application>Valgrind</application>.
     144    </para> -->
    140145
    141146  </sect2>
    … …  
    154159        </seg>
    155160        <seg>
    156           libdrm.so, libdrm_amdgpu.so, libdrm_intel.so, libdrm_nouveau.so,
    157           libdrm_radeon.so and libkms.so
     161          libdrm_amdgpu.so, libdrm_intel.so, libdrm_nouveau.so,
     162          libdrm_radeon.so, libdrm.so, and libkms.so
    158163        </seg>
    159164        <seg>
    160           /usr/include/libdrm and
    161           /usr/include/libkms
     165          /usr/include/lib{drm,kms}
    162166        </seg>
    163167      </seglistitem>
    … …  
    169173      <?dbhtml list-presentation="table"?>
    170174
     175      <varlistentry id="libdrm_amdgpu">
     176        <term><filename class="libraryfile">libdrm_amdgpu.so</filename></term>
     177        <listitem>
     178          <para>
     179            contains the AMDGPU specific Direct Rendering Manager functions.
     180          </para>
     181          <indexterm zone="libdrm libdrm_amdgpu">
     182            <primary sortas="c-libdrm_amdgpu">libdrm_amdgpu.so</primary>
     183          </indexterm>
     184        </listitem>
     185      </varlistentry>
     186
     187      <varlistentry id="libdrm_intel">
     188        <term><filename class="libraryfile">libdrm_intel.so</filename></term>
     189        <listitem>
     190          <para>
     191            contains the Intel specific Direct Rendering Manager
     192            functions.
     193          </para>
     194          <indexterm zone="libdrm libdrm_intel">
     195            <primary sortas="c-libdrm_intel">libdrm_intel.so</primary>
     196          </indexterm>
     197        </listitem>
     198      </varlistentry>
     199
     200      <varlistentry id="libdrm_nouveau">
     201        <term><filename class="libraryfile">libdrm_nouveau.so</filename></term>
     202        <listitem>
     203          <para>
     204            contains the open source nVidia (Nouveau) specific Direct
     205            Rendering Manager functions.
     206          </para>
     207          <indexterm zone="libdrm libdrm_nouveau">
     208            <primary sortas="c-libdrm_nouveau">libdrm_nouveau.so</primary>
     209          </indexterm>
     210        </listitem>
     211      </varlistentry>
     212
    171213      <varlistentry id="libdrm-lib">
    172214        <term><filename class="libraryfile">libdrm.so</filename></term>
    … …  
    180222        </listitem>
    181223      </varlistentry>
    182      
    183       <varlistentry id="libdrm_amdgpu">
    184         <term><filename class="libraryfile">libdrm_amdgpu.so</filename></term>
    185         <listitem>
    186           <para>
    187             contains the AMDGPU specific DRM functions.
    188           </para>
    189           <indexterm zone="libdrm libdrm_amdgpu">
    190             <primary sortas="c-libdrm_amdgpu">libdrm_amdgpu.so</primary>
    191           </indexterm>
    192         </listitem>
    193       </varlistentry>
    194 
    195       <varlistentry id="libdrm_intel">
    196         <term><filename class="libraryfile">libdrm_intel.so</filename></term>
    197         <listitem>
    198           <para>
    199             contains the Intel specific Direct Rendering Manager
    200             functions.
    201           </para>
    202           <indexterm zone="libdrm libdrm_intel">
    203             <primary sortas="c-libdrm_intel">libdrm_intel.so</primary>
    204           </indexterm>
    205         </listitem>
    206       </varlistentry>
    207 
    208       <varlistentry id="libdrm_nouveau">
    209         <term><filename class="libraryfile">libdrm_nouveau.so</filename></term>
    210         <listitem>
    211           <para>
    212             contains the open source nVidia (Nouveau) specific Direct
    213             Rendering Manager functions.
    214           </para>
    215           <indexterm zone="libdrm libdrm_nouveau">
    216             <primary sortas="c-libdrm_nouveau">libdrm_nouveau.so</primary>
    217           </indexterm>
    218         </listitem>
    219       </varlistentry>
    220224
    221225      <varlistentry id="libdrm_radeon">

  • general/genlib/libdrm.xml

    rf587275 rc4dd285f  
    77  <!ENTITY libdrm-download-http "http://dri.freedesktop.org/libdrm/libdrm-&libdrm-version;.tar.bz2">
    88  <!ENTITY libdrm-download-ftp  " ">
    9   <!ENTITY libdrm-md5sum        "543b2d28359ef33974fa0e772dd61732">
    10   <!ENTITY libdrm-size          "628 KB">
    11   <!ENTITY libdrm-buildsize     "15 MB (with the test suite)">
    12   <!ENTITY libdrm-time          "0.4 SBU (up to an additional 2.0 SBU for the test suite)">
     9  <!ENTITY libdrm-md5sum        "c6809c48538d6e5999588832045ff014">
     10  <!ENTITY libdrm-size          "680 KB">
     11  <!ENTITY libdrm-buildsize     "17 MB (with tests)">
     12  <!ENTITY libdrm-time          "0.8 SBU (with tests)">
    1313]>
    1414
    … …  
    8383    <bridgehead renderas="sect4">Optional</bridgehead>
    8484    <para role="optional">
    85       <xref linkend="cairo"/> (for the testsuite),
    8685      <xref linkend="DocBook"/>,
    8786      <xref linkend="docbook-xsl"/> and
    … …  
    103102    </para>
    104103
    105 <screen><userinput>sed -e "/pthread-stubs/d" -i configure.ac &amp;&amp;
    106 autoreconf -fiv &amp;&amp;
     104<screen><userinput>sed -e "/pthread-stubs/d" \
     105    -i configure.ac &amp;&amp;
     106autoreconf -fiv     &amp;&amp;
     107
    107108./configure --prefix=/usr --enable-udev &amp;&amp;
     109
    108110make</userinput></screen>
    109111
    110112    <para>
    111       To check the results, issue <command>make check</command>.
     113      To check the results, issue <command>make check</command>. Tests may hang
     114      for unknown reasons. If nouveau threaded test hangs, you can disable it
     115      with
     116      <command>sed -i 's/^TESTS/#&amp;/' tests/nouveau/Makefile.in</command>.
    112117    </para>
    113118
    … …  
    133138      <application>Udev</application> instead of <command>mknod</command>.
    134139    </para>
     140<!--
     141    <para>
     142      <parameter>-\-disable-valgrind</parameter>: This parameter fixes a hard dependency on
     143      <application>Valgrind</application>.
     144    </para> -->
    135145
    136146  </sect2>
    … …  
    149159        </seg>
    150160        <seg>
    151           libdrm.so, libdrm_amdgpu.so, libdrm_intel.so, libdrm_nouveau.so,
    152           libdrm_radeon.so and libkms.so
     161          libdrm_amdgpu.so, libdrm_intel.so, libdrm_nouveau.so,
     162          libdrm_radeon.so, libdrm.so, and libkms.so
    153163        </seg>
    154164        <seg>
    155           /usr/include/libdrm and
    156           /usr/include/libkms
     165          /usr/include/lib{drm,kms}
    157166        </seg>
    158167      </seglistitem>
    … …  
    164173      <?dbhtml list-presentation="table"?>
    165174
     175      <varlistentry id="libdrm_amdgpu">
     176        <term><filename class="libraryfile">libdrm_amdgpu.so</filename></term>
     177        <listitem>
     178          <para>
     179            contains the AMDGPU specific Direct Rendering Manager functions.
     180          </para>
     181          <indexterm zone="libdrm libdrm_amdgpu">
     182            <primary sortas="c-libdrm_amdgpu">libdrm_amdgpu.so</primary>
     183          </indexterm>
     184        </listitem>
     185      </varlistentry>
     186
     187      <varlistentry id="libdrm_intel">
     188        <term><filename class="libraryfile">libdrm_intel.so</filename></term>
     189        <listitem>
     190          <para>
     191            contains the Intel specific Direct Rendering Manager
     192            functions.
     193          </para>
     194          <indexterm zone="libdrm libdrm_intel">
     195            <primary sortas="c-libdrm_intel">libdrm_intel.so</primary>
     196          </indexterm>
     197        </listitem>
     198      </varlistentry>
     199
     200      <varlistentry id="libdrm_nouveau">
     201        <term><filename class="libraryfile">libdrm_nouveau.so</filename></term>
     202        <listitem>
     203          <para>
     204            contains the open source nVidia (Nouveau) specific Direct
     205            Rendering Manager functions.
     206          </para>
     207          <indexterm zone="libdrm libdrm_nouveau">
     208            <primary sortas="c-libdrm_nouveau">libdrm_nouveau.so</primary>
     209          </indexterm>
     210        </listitem>
     211      </varlistentry>
     212
    166213      <varlistentry id="libdrm-lib">
    167214        <term><filename class="libraryfile">libdrm.so</filename></term>
    … …  
    176223      </varlistentry>
    177224
    178       <varlistentry id="libdrm_amdgpu">
    179         <term><filename class="libraryfile">libdrm_amdgpu.so</filename></term>
    180         <listitem>
    181           <para>
    182             contains the AMD specific DRM functions.
    183           </para>
    184           <indexterm zone="libdrm libdrm_amdgpu">
    185             <primary sortas="c-libdrm_amdgpu">libdrm_amdgpu.so</primary>
    186           </indexterm>
    187         </listitem>
    188       </varlistentry>
    189 
    190       <varlistentry id="libdrm_intel">
    191         <term><filename class="libraryfile">libdrm_intel.so</filename></term>
    192         <listitem>
    193           <para>
    194             contains the Intel specific Direct Rendering Manager
    195             functions.
    196           </para>
    197           <indexterm zone="libdrm libdrm_intel">
    198             <primary sortas="c-libdrm_intel">libdrm_intel.so</primary>
    199           </indexterm>
    200         </listitem>
    201       </varlistentry>
    202 
    203       <varlistentry id="libdrm_nouveau">
    204         <term><filename class="libraryfile">libdrm_nouveau.so</filename></term>
    205         <listitem>
    206           <para>
    207             contains the open source nVidia (Nouveau) specific Direct
    208             Rendering Manager functions.
    209           </para>
    210           <indexterm zone="libdrm libdrm_nouveau">
    211             <primary sortas="c-libdrm_nouveau">libdrm_nouveau.so</primary>
    212           </indexterm>
    213         </listitem>
    214       </varlistentry>
    215 
    216225      <varlistentry id="libdrm_radeon">
    217226        <term><filename class="libraryfile">libdrm_radeon.so</filename></term>

  • general/genlib/libgusb.xml

    rf587275 rc4dd285f  
    77  <!ENTITY libgusb-download-http "http://people.freedesktop.org/~hughsient/releases/libgusb-&libgusb-version;.tar.xz">
    88  <!ENTITY libgusb-download-ftp  " ">
    9   <!ENTITY libgusb-md5sum        "eae30027dfad4dd30f77d8ed8d85b40e">
    10   <!ENTITY libgusb-size          "272 KB">
    11   <!ENTITY libgusb-buildsize     "4.2 MB">
    12   <!ENTITY libgusb-time          "less than 0.1 SBU">
     9  <!ENTITY libgusb-md5sum        "d0e4c970e2386900c99cab41d9b17e23">
     10  <!ENTITY libgusb-size          "284 KB">
     11  <!ENTITY libgusb-buildsize     "5.4 MB (with tests))">
     12  <!ENTITY libgusb-time          "less than 0.1 SBU (with tests)">
    1313]>
    1414
    … …  
    1717
    1818  <sect1info>
    19     <othername>$LastChangedBy: fernando $</othername>
    20     <date>$Date: 2014-11-21 17:35:29 +0100 (Pet, 21 Nov 2014) $</date>
     19    <othername>$LastChangedBy: dj $</othername>
     20    <date>$Date: 2016-01-24 02:01:02 -0600 (Sun, 24 Jan 2016) $</date>
    2121  </sect1info>
    2222
    … …  
    3737    </para>
    3838
    39     &lfs77_checked;
     39    &lfs78_checked;
    4040
    4141    <bridgehead renderas="sect3">Package Information</bridgehead>
    … …  
    8282    <bridgehead renderas="sect4">Recommended</bridgehead>
    8383    <para role="recommended">
    84       <xref linkend="gobject-introspection"/> and
     84      <xref linkend="gobject-introspection"/>,
     85      <xref linkend="usbutils"/> (for <filename>usb.ids</filename> data file,
     86      which is also required for the tests), and
    8587      <xref linkend="vala"/>
    8688    </para>

  • general/genlib/qca.xml

    rf587275 rc4dd285f  
    55  %general-entities;
    66
    7   <!ENTITY qca-download-http "http://delta.affinix.com/download/qca/2.0/qca-&qca-version;.tar.bz2">
     7  <!ENTITY qca-download-http "http://download.kde.org/stable/qca/&qca-version;/src/qca-&qca-version;.tar.xz">
    88  <!ENTITY qca-download-ftp  " ">
    9   <!ENTITY qca-md5sum        "c2b00c732036244701bae4853a2101cf">
    10   <!ENTITY qca-size          "933 KB">
    11   <!ENTITY qca-buildsize     "29.2 MB">
    12   <!ENTITY qca-time          "1.9 SBU">
     9  <!ENTITY qca-md5sum        "657cc701316600199199a6b6cb2c73c9">
     10  <!ENTITY qca-size          "676 KB">
     11  <!ENTITY qca-buildsize     "28 MB">
     12  <!ENTITY qca-time          "1.2 SBU (additional 0.3 SBU for the tests)">
    1313]>
    1414
    … …  
    3535    the implementation, using plugins known as Providers.</para>
    3636
    37     &lfs76_checked;
     37    &lfs78_checked;
    3838
    3939    <bridgehead renderas="sect3">Package Information</bridgehead>
    … …  
    6363    <bridgehead renderas="sect4">Required</bridgehead>
    6464    <para role="required">
    65     <xref linkend="cmake"/> and
    66     <xref linkend="qt4"/>
    67     </para>
    68 
    69     <bridgehead renderas="sect4">Recommended</bridgehead>
    70     <para role="recommended">
    71       <xref linkend="cacerts"/>
     65    <xref linkend="cacerts"/>,
     66    <xref linkend="cmake"/>,
     67    <xref linkend="qt4"/> or <xref linkend="qt5"/>, and
     68    <xref linkend="which"/>
    7269    </para>
    7370
    7471    <bridgehead renderas="sect4">Optional</bridgehead>
    75     <para role="optional">
    76       <xref linkend="cyrus-sasl"/>,
    77       <xref linkend="gnupg2"/>,
    78       <xref linkend="libgcrypt"/>,
    79       <xref linkend="nss"/>,
    80       <xref linkend="openssl"/>,
    81       <xref linkend="qt5"/>,
    82       <ulink url="http://botan.randombit.net/">Botan</ulink> and
    83       <ulink url="https://github.com/OpenSC/pkcs11-helper">pkcs11-helper</ulink>
     72    <para role="Optional">
     73    <xref linkend="cyrus-sasl"/>,
     74    <xref linkend="gnupg2"/>,
     75    <xref linkend="libgcrypt"/>,
     76    <xref linkend="libgpg-error"/>,
     77    <xref linkend="nss"/>,
     78    <xref linkend="nspr"/>,
     79    <xref linkend="openssl"/>,
     80    <xref linkend="p11-kit"/>,
     81    <xref linkend="doxygen"/>, and
     82    <xref linkend="which"/>
    8483    </para>
    8584
    … …  
    9291    <title>Installation of Qca</title>
    9392
     93    <para>If desired, remove a lot of irritating warnings when building:</para>
     94
     95<screen><userinput>sed -i 's/BSD/DEFAULT/' CMakeLists.txt</userinput></screen>
     96
    9497    <para>Install <application>Qca</application> by running the following
    9598    commands:</para>
    … …  
    98101cd    build &amp;&amp;
    99102
    100 cmake -DCMAKE_INSTALL_PREFIX=/usr \
    101       -DCMAKE_BUILD_TYPE=Release  \
    102       -DQT4_BUILD=ON              \
    103       -DQCA_DOC_INSTALL_DIR=/usr/share/doc/qca-2.1.0            \
    104       -DQCA_FEATURE_INSTALL_DIR=/usr/share/qt4/mkspecs/features \
    105       -DQCA_INCLUDE_INSTALL_DIR=/usr/include/qt4                \
    106       -DQCA_PRIVATE_INCLUDE_INSTALL_DIR=/usr/include/qt4        \
    107       -DQCA_PLUGINS_INSTALL_DIR=/usr/lib/qt4/plugins            \
    108       -Wno-dev .. &amp;&amp;
     103cmake -DCMAKE_INSTALL_PREFIX=&qt4-dir;            \
     104      -DCMAKE_BUILD_TYPE=Release                \
     105      -DQT4_BUILD=ON                            \
     106      -DQCA_MAN_INSTALL_DIR:PATH=/usr/share/man \
     107      ..                                        &amp;&amp;
    109108
    110109make</userinput></screen>
    … …  
    116115<screen role="root"><userinput>make install</userinput></screen>
    117116
    118     <para>
    119       If <application>Qt4</application> isn't installed in
    120       <filename class="directory">/usr</filename>, ensure
    121       it can properly find the modules installed by this
    122       package by running the following commands as the
    123       <systemitem class="username">root</systemitem> user:
    124     </para>
    125 
    126 <screen role="root"><userinput>if [[ ${QT4DIR} != "/usr" ]]
    127 then
    128    ln -sfv /usr/include/qt4/QtCrypto                  \
    129            ${QT4DIR}/include/qt4/                     &amp;&amp;
    130    ln -sfv /usr/share/qt4/mkspecs/features/crypto.prf \
    131            ${QT4DIR}/share/qt4/mkspecs/features/      &amp;&amp;
    132 
    133    install -v -dm755 ${QT4DIR}/lib/qt4/plugins/crypto &amp;&amp;
    134 
    135    for file in /usr/lib/qt4/plugins/crypto/*
    136    do
    137        ln -sfv ${file} ${QT4DIR}/lib/qt4/plugins/crypto/
    138    done &amp;&amp;
    139 
    140    unset file
    141 fi</userinput></screen>
    142 
    143117  </sect2>
    144118
    … …  
    146120    <title>Command Explanations</title>
    147121
    148     <para><parameter>-DCMAKE_BUILD_TYPE=Release</parameter>: This switch is used
    149     to apply higher level of the compiler optimizations.</para>
    150  
    151     <para><parameter>-DQT4_BUILD=ON</parameter>: This switch is used to ensure
    152     that <application>Qt4</application> version of the library is built even if
    153     <application>Qt5</application> is present.</para>
     122    <para><parameter>-DCMAKE_BUILD_TYPE=Release</parameter>: This switch is
     123    used to apply a higher level of compiler optimizations.</para>
    154124
    155     <para><parameter>-DQCA_*_INSTALL_DIR=...</parameter>: These switches are used
    156     to ensure that files depending on the <application>Qt4</application>
    157      installation prefix are installed in the correct locations.</para>
     125    <para><parameter>-DQT4_BUILD=ON</parameter>: This switch is used to force
     126    building with Qt4 even if Qt5 is found. There are no packages in BLFS
     127    that use the Qt5 version of Qca.</para>
     128
     129    <para><parameter>-DQCA_MAN_INSTALL_DIR:PATH=/usr/share/man</parameter>:
     130    Install the qca man page in the normal location.</para>
    158131
    159132  </sect2>
    … …  
    168141
    169142      <seglistitem>
    170         <seg>mozcerts and qcatool2</seg>
    171         <seg>libqca.so</seg>
     143        <seg>mozcerts and qcatool (if building with Qt5, the binaries have a -qt5 suffix)</seg>
     144        <seg>libqca.so (libqca-qt5.so if building with Qt5) and plugins at &qt4-dir;/lib/qca/crypto</seg>
    172145        <seg>
    173           /usr/include/qt4/QtCrypto,
    174           /usr/lib/cmake/Qca,
    175           /usr/lib/qt4/plugins/crypto and,
    176           depending on the <application>Qt4</application>
    177           installation prefix,
    178           $QT4DIR/include/qt4/QtCrypto and
    179           $QT4DIR/lib/qt4/plugins/crypto
     146          &qt4-dir;/include/QtCrypto (or &qt5-dir;/include/Qca-qt5),
     147          &qt4-dir;/lib/cmake/Qca (or &qt5-dir;/lib/cmake/Qca-qt5) and
     148          &qt4-dir;/lib/qca (or &qt5-dir;/lib/qca-qt5)
    180149        </seg>
    181150      </seglistitem>
    … …  
    198167      </varlistentry>
    199168
    200       <varlistentry id="qcatool2">
    201         <term><command>qcatool2</command></term>
     169      <varlistentry id="qcatool">
     170        <term><command>qcatool</command></term>
    202171        <listitem>
    203172          <para>is a command line tool for performing various cryptographic
    204           operations with Qca.</para>
    205           <indexterm zone="qca qcatool2">
    206             <primary sortas="b-qcatool2">qcatool2</primary>
     173          operations with Qca.</para>
     174          <indexterm zone="qca qcatool">
     175            <primary sortas="b-qcatool">qcatool</primary>
    207176          </indexterm>
    208177        </listitem>
Note: See TracChangeset for help on using the changeset viewer.