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

File:
1 edited

Legend:

Unmodified
Added
Removed

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