Changeset af73a280 for general/genlib


Ignore:
Timestamp:
06/05/2013 09:28:44 AM (11 years ago)
Author:
Krejzi <krejzi@…>
Branches:
systemd-11177
Children:
5b00a2a
Parents:
13e0a61
Message:

Merge trunk and systemd branch.

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

Location:
general/genlib
Files:
5 edited

Legend:

Unmodified
Added
Removed

  • general/genlib/icu.xml

    r13e0a61 raf73a280  
    88           "http://download.icu-project.org/files/icu4c/&icu-version;/icu4c-&icu-dl-version;-src.tgz">
    99  <!ENTITY icu-download-ftp  " ">
    10   <!ENTITY icu-md5sum        "6eef33b229d0239d654983028c9c7053">
     10  <!ENTITY icu-md5sum        "072e501b87065f3a0ca888f1b5165709">
    1111  <!ENTITY icu-size          "21 MB">
    12   <!ENTITY icu-buildsize     "285 MB">
    13   <!ENTITY icu-time          "1.5 SBU">
     12  <!ENTITY icu-buildsize     "288 MB">
     13  <!ENTITY icu-time          "1.0 SBU">
    1414]>
    1515

  • general/genlib/libdbusmenuqt.xml

    r13e0a61 raf73a280  
    7070    <bridgehead renderas="sect4">Required</bridgehead>
    7171    <para role="required">
    72     <xref linkend="qt"/>
     72    <xref linkend="qt4"/>
    7373    </para>
    7474
    … …  
    9292<screen><userinput>mkdir build &amp;&amp;
    9393cd build &amp;&amp;
    94 cmake -DCMAKE_INSTALL_PREFIX=&qt-dir; \
     94cmake -DCMAKE_INSTALL_PREFIX=&qt4-dir; \
    9595      -DWITH_DOC=OFF .. &amp;&amp;
    9696make</userinput></screen>
    … …  
    126126        <seg>None</seg>
    127127        <seg>libdbusmenu-qt.so</seg>
    128         <seg>&qt-dir;/include/dbusmenu-qt</seg>
     128        <seg>&qt4-dir;/include/dbusmenu-qt</seg>
    129129      </seglistitem>
    130130    </segmentedlist>

  • general/genlib/pcre.xml

    r13e0a61 raf73a280  
    77  <!ENTITY pcre-download-http "&sourceforge-repo;/pcre/pcre-&pcre-version;.tar.bz2">
    88  <!ENTITY pcre-download-ftp  "ftp://ftp.csx.cam.ac.uk/pub/software/programming/pcre/pcre-&pcre-version;.tar.bz2">
    9   <!ENTITY pcre-md5sum        "62f02a76bb57a40bc66681760ed511d5">
    10   <!ENTITY pcre-size          "1.3 MB">
    11   <!ENTITY pcre-buildsize     "16 MB">
    12   <!ENTITY pcre-time          "0.3 SBU">
     9  <!ENTITY pcre-md5sum        "21514018448ac10062ece7a668fca949">
     10  <!ENTITY pcre-size          "1.4 MB">
     11  <!ENTITY pcre-buildsize     "18 MB">
     12  <!ENTITY pcre-time          "0.2 SBU">
    1313]>
    1414
    … …  
    7979    <para role="optional">
    8080      <ulink url="http://valgrind.org/">Valgrind</ulink>
     81<!-- -&#45;enable-pcretest-libedit (redundant as long as LFS installs libreadline
     82      and <ulink url="http://www.thrysoee.dk/editline/">libedit</ulink>
     83-->
    8184    </para>
    8285
    … …  
    100103            --enable-pcregrep-libz            \
    101104            --enable-pcregrep-libbz2          \
     105            --enable-pcretest-libreadline     \
    102106            --disable-static                 &amp;&amp;
    103107make</userinput></screen>
    … …  
    113117<screen role="root"><userinput>make install                     &amp;&amp;
    114118mv -v /usr/lib/libpcre.so.* /lib &amp;&amp;
    115 ln -sfv ../../lib/libpcre.so.1.2.0 /usr/lib/libpcre.so</userinput></screen>
     119ln -sfv ../../lib/libpcre.so.1.2.1 /usr/lib/libpcre.so</userinput></screen>
    116120
    117121  </sect2>
    … …  
    142146      support to <command>pcregrep</command> to read
    143147      <filename class="extension">.bz2</filename> compressed files.
     148    </para>
     149
     150    <para>
     151      <option>--enable-pcretest-libreadline</option>: This switch adds line
     152      editing and history features to <command>pcretest</command> program.
    144153    </para>
    145154

  • general/genlib/qca.xml

    r13e0a61 raf73a280  
    7272    <bridgehead renderas="sect4">Required</bridgehead>
    7373    <para role="required">
    74     <xref linkend="qt"/> and
     74    <xref linkend="qt4"/> and
    7575    <xref linkend="which"/>
    7676    </para>
    … …  
    8888
    8989<screen><userinput>sed -i '217s@set@this->set@' src/botantools/botan/botan/secmem.h &amp;&amp;
    90 ./configure --prefix=&qt-dir; \
     90./configure --prefix=&qt4-dir; \
    9191            --certstore-path=/etc/ssl/ca-bundle.crt &amp;&amp;
    9292make</userinput></screen>
    … …  
    124124        <seg>qcatool2 and qcatool2.debug</seg>
    125125        <seg>libqca.so and libqca.so.&qca-version;.debug</seg>
    126         <seg>&qt-dir;/include/QtCrypto and &qt-dir;/share/qca</seg>
     126        <seg>&qt4-dir;/include/QtCrypto and &qt4-dir;/share/qca</seg>
    127127      </seglistitem>
    128128    </segmentedlist>

  • general/genlib/qjson.xml

    r13e0a61 raf73a280  
    7575    <bridgehead renderas="sect4">Required</bridgehead>
    7676    <para role="required">
    77       <xref linkend="qt"/> and
     77      <xref linkend="qt4"/> and
    7878      <xref linkend="cmake"/>
    7979    </para>   
    … …  
    9494<screen><userinput>mkdir build &amp;&amp;
    9595cd build &amp;&amp;
    96 cmake -DCMAKE_INSTALL_PREFIX=&qt-dir; \
     96cmake -DCMAKE_INSTALL_PREFIX=&qt4-dir; \
    9797      -DCMAKE_BUILD_TYPE=Release \
    9898      .. &amp;&amp;
    … …  
    126126        </seg>
    127127        <seg>
    128           &qt-dir;/include/json and &qt-dir;/lib/cmake/qjson
     128          &qt4-dir;/include/json and &qt4-dir;/lib/cmake/qjson
    129129        </seg>
    130130      </seglistitem>
Note: See TracChangeset for help on using the changeset viewer.