Changeset 9a3e4ba for general/prog


Ignore:
Timestamp:
02/24/2016 07:31:59 AM (8 years ago)
Author:
DJ Lucas <dj@…>
Branches:
systemd-13485
Children:
996dfc4a
Parents:
a91856d1
Message:

Merge changes from trunk to r17005.

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

Location:
general/prog
Files:
2 edited

Legend:

Unmodified
Added
Removed

  • general/prog/git.xml

    ra91856d1 r9a3e4ba  
    99  <!ENTITY git-download-http "&git-root;/git-&git-version;.tar.xz">
    1010  <!ENTITY git-download-ftp  "ftp://ftp.kernel.org/pub/software/scm/git/git-&git-version;.tar.xz">
    11   <!ENTITY git-md5sum        "0214e04f7041f835c5c38f2b78eccced">
    12   <!ENTITY git-size          "3.7 MB">
    13   <!ENTITY git-buildsize     "349 MB (add 28 MB for building documentation)">
    14   <!ENTITY git-time          "0.7 SBU (add 12 SBU for tests and 2.4 SBU for building documentation)">
     11  <!ENTITY git-md5sum        "eece7b1e87983271621a0cb6aab37a25">
     12  <!ENTITY git-size          "3.8 MB">
     13  <!ENTITY git-buildsize     "364 MB (including the pre-built documentation)">
     14  <!ENTITY git-time          "0.8 SBU (add 2.4 SBU for building documentation)">
     15  <!-- tests used to take 12 SBU, grep-2.23 causes them to fail after 4.0 SBU -->
    1516]>
    1617
    … …  
    170171
    171172    <para>
    172       The test suite can be run in parallel mode. To run the test suite, issue:
    173       <command>make test</command>.
     173<!--  The test suite can be run in parallel mode. To run the test suite, issue: -->
     174      The test suite fails early, in 'blame respects encoding', because grep-2.23
     175      treats data in the locale tests as binary.  To run the tests up to that
     176      point issue:
     177      <command>make test</command>. -->
    174178    </para>
    175179

  • general/prog/lua.xml

    ra91856d1 r9a3e4ba  
    120120    <title>Installation of Lua</title>
    121121
    122     <para>
    123       Install <application>Lua</application> by running the following
    124       commands:
    125     </para>
    126 
    127 <screen><userinput>patch -Np1 -i ../lua-&lua-version;-shared_library-1.patch &amp;&amp;
    128 
    129 sed -i '/#define LUA_ROOT/s:/usr/local/:/usr/:' src/luaconf.h &amp;&amp;
    130 
    131 make linux</userinput></screen>
    132 
    133     <para>
    134       To test the results, issue: <command>make test</command>.
    135       <quote>This will run the interpreter and print its version.</quote>.
    136       More comprehensive tests can be performed if you downloaded the "Test
    137       suite" tarball. Those tests need to be executed after the package is
    138       installed, thus we defer to describe then below.
    139     </para>
    140 
    141     <para>
    142       Now, as the <systemitem class="username">root</systemitem> user:
    143     </para>
    144 
    145 <screen role="root"><userinput>make INSTALL_TOP=/usr TO_LIB="liblua.so liblua.so.5.3 liblua.so.&lua-version;" \
    146      INSTALL_DATA="cp -d" INSTALL_MAN=/usr/share/man/man1 install &amp;&amp;
    147 
    148 mkdir -pv /usr/share/doc/lua-&lua-version; &amp;&amp;
    149 cp -v doc/*.{html,css,gif,png} /usr/share/doc/lua-&lua-version;</userinput></screen>
    150 
    151122    <para>Some packages check for the <application>pkg-config</application> file
    152     for <application>Lua</application>. As the
    153     <systemitem class="username">root</systemitem> user:</para>
    154 
    155 <screen role="root"><userinput>cat &gt; /usr/lib/pkgconfig/lua.pc &lt;&lt; "EOF"
     123    for <application>Lua</application>, wich is created with:</para>
     124
     125<screen role="root"><userinput>cat &gt; lua.pc &lt;&lt; "EOF"
    156126<literal>V=5.3
    157127R=&lua-version;
    … …  
    177147
    178148    <para>
     149      Install <application>Lua</application> by running the following
     150      commands:
     151    </para>
     152
     153<screen><userinput>patch -Np1 -i ../lua-&lua-version;-shared_library-1.patch &amp;&amp;
     154
     155sed -i '/#define LUA_ROOT/s:/usr/local/:/usr/:' src/luaconf.h &amp;&amp;
     156
     157make MYCFLAGS="-DLUA_COMPAT_5_2 -DLUA_COMPAT_5_1" linux</userinput></screen>
     158
     159    <para>
     160      To test the results, issue: <command>make test</command>.
     161      <quote>This will run the interpreter and print its version.</quote>.
     162      More comprehensive tests can be performed if you downloaded the "Test
     163      suite" tarball. Those tests need to be executed after the package is
     164      installed, thus we defer to describe then below.
     165    </para>
     166
     167    <para>
     168      Now, as the <systemitem class="username">root</systemitem> user:
     169    </para>
     170
     171<screen role="root"><userinput>make INSTALL_TOP=/usr TO_LIB="liblua.so liblua.so.5.3 liblua.so.&lua-version;" \
     172     INSTALL_DATA="cp -d" INSTALL_MAN=/usr/share/man/man1 install &amp;&amp;
     173
     174mkdir -pv /usr/share/doc/lua-&lua-version; &amp;&amp;
     175cp -v doc/*.{html,css,gif,png} /usr/share/doc/lua-&lua-version; &amp;&amp;
     176
     177install -v -m644 -D lua.pc /usr/lib/pkgconfig/lua.pc</userinput></screen>
     178
     179    <para>
    179180      We are going to describe only the "Basic tests". Untar the tarball and
    180181      change to the
    … …  
    194195      <command>sed -i ... src/luaconf.h</command>: This command changes
    195196      <application>Lua</application> search path to match the install paths.
     197    </para>
     198
     199    <para>
     200      <envar>MYCFLAGS="-DLUA_COMPAT_5_2 -DLUA_COMPAT_5_1"</envar>: This
     201      environment variable includes compatibility layers with Lua 5.1 and 5.2
     202      in the build.
    196203    </para>
    197204
Note: See TracChangeset for help on using the changeset viewer.