Changeset eb7de89


Ignore:
Timestamp:
06/30/2020 10:01:54 PM (4 years ago)
Author:
Douglas R. Reno <renodr@…>
Branches:
10.0, 10.1, 11.0, 11.1, 11.2, 11.3, 12.0, 12.1, kea, ken/TL2024, ken/inkscape-core-mods, ken/tuningfonts, lazarus, lxqt, plabs/newcss, plabs/python-mods, python3.11, qt5new, rahul/power-profiles-daemon, renodr/vulkan-addition, trunk, upgradedb, xry111/intltool, xry111/llvm18, xry111/soup3, xry111/test-20220226, xry111/xf86-video-removal
Children:
c744d0a5
Parents:
5ce1bdb
Message:

Update to lua-5.4.0
VIM: Adapt Lua interface to Lua-5.4
Apache/httpd: Adapt Lua module to Lua-5.4
Brotli: Remove invalid dependency on lua, there is a separate package that provides one, and it's not bundled with our download of Brotli
Dovecot: Add a command explanation describing how to build Lua support
Lua-5.2: Minor adjustment to installed files
Hexchat: Promote libcanberra to recommended

git-svn-id: svn://svn.linuxfromscratch.org/BLFS/trunk/BOOK@23350 af4574ff-66df-0310-9fd7-8a98e5e911e0

Files:
10 edited

Legend:

Unmodified
Added
Removed

  • general/genlib/brotli.xml

    r5ce1bdb reb7de89  
    9696    </para>
    9797
     98    <!-- Brotli doesn't have any lua bindings, at least not with 1.0.7. -->
    9899    <bridgehead renderas="sect4">Optional</bridgehead>
    99100    <para role="optional">
    100       <xref linkend="lua"/> (to create Lua bindings) and
     101  <!--<xref linkend="lua"/> (to create Lua bindings) and -->
    101102      <xref linkend="python2"/> (to create python2 bindings)
    102103    </para>

  • general/graphlib/potrace.xml

    r5ce1bdb reb7de89  
    3333      <!-- summarized from the home page, where Potrace(TM) is used -->
    3434      <application>Potrace&#8482;</application> is a tool for transforming a bitmap
    35        (PBM, PGM, PPM, or BMP format) into one of several vector file formats.
     35      (PBM, PGM, PPM, or BMP format) into one of several vector file formats.
    3636    </para>
    3737
    … …  
    7676    <bridgehead renderas="sect4">Recommended</bridgehead>
    7777    <para role="recommended">
    78       <xref linkend="llvm"/> (including <command>clang</command>).
     78      <xref linkend="llvm"/> (including <command>clang</command>)
    7979    </para>
    8080

  • general/prog/lua.xml

    r5ce1bdb reb7de89  
    77  <!ENTITY lua-download-http "http://www.lua.org/ftp/lua-&lua-version;.tar.gz">
    88  <!ENTITY lua-download-ftp  " ">
    9   <!ENTITY lua-md5sum        "4f4b4f323fd3514a68e0ab3da8ce3455">
    10   <!ENTITY lua-size          "300 KB">
    11   <!ENTITY lua-buildsize     "4.5 MB (with Basic tests)">
     9  <!ENTITY lua-md5sum        "dbf155764e5d433fc55ae80ea7060b60">
     10  <!ENTITY lua-size          "344 KB">
     11  <!ENTITY lua-buildsize     "5.5 MB (with Basic tests)">
    1212  <!ENTITY lua-time          "less than 0.1 SBU (with Basic tests)">
    1313
    14 <!-- Note for editors - the soname and test suite versions did not change, so I
    15      Had to hardcode them. -renodr -->
    16   <!ENTITY lua-tests-download-http "http://www.lua.org/tests/lua-5.3.4-tests.tar.gz">
     14  <!ENTITY lua-tests-download-http "http://www.lua.org/tests/lua-&lua-version;-tests.tar.gz">
    1715  <!ENTITY lua-tests-download-ftp  " ">
    18   <!ENTITY lua-tests-md5sum        "b14fe3748c1cb2d74e3acd1943629ba3">
    19   <!ENTITY lua-tests-size          "104 KB">
     16  <!ENTITY lua-tests-md5sum        "3d7768b090046506afa974a4ac0c5ba2">
     17  <!ENTITY lua-tests-size          "124 KB">
    2018]>
    2119
    … …  
    128126
    129127<screen><userinput>cat &gt; lua.pc &lt;&lt; "EOF"
    130 <literal>V=5.3
     128<literal>V=5.4
    131129R=&lua-version;
    132130
    … …  
    156154
    157155<screen><userinput>patch -Np1 -i ../lua-&lua-version;-shared_library-1.patch &amp;&amp;
    158 sed -i '/#define LUA_ROOT/s:/usr/local/:/usr/:' src/luaconf.h &amp;&amp;
    159 
    160 make MYCFLAGS="-DLUA_COMPAT_5_2 -DLUA_COMPAT_5_1" linux</userinput></screen>
     156make linux</userinput></screen>
     157<!-- make MYCFLAGS="-DLUA_COMPAT_5_2 -DLUA_COMPAT_5_1" linux
     158     The MYCFLAGS="" part was brought into the patch since optimization had to
     159     be turned off.
     160     The LUA_ROOT change also has been merged into the patch.-->
    161161
    162162    <para>
    163163      To test the results, issue: <command>make test</command>.
    164       <quote>This will run the interpreter and print its version.</quote>.
     164      <quote>This will run the interpreter and print its version</quote>.
    165165      More comprehensive tests can be performed if you downloaded the "Test
    166166      suite" tarball. Those tests need to be executed after the package is
    … …  
    175175     INSTALL_DATA="cp -d"            \
    176176     INSTALL_MAN=/usr/share/man/man1 \
    177      TO_LIB="liblua.so liblua.so.5.3 liblua.so.5.3.4" \
     177     TO_LIB="liblua.so liblua.so.5.4 liblua.so.&lua-version;" \
    178178     install &amp;&amp;
    179 <!-- As stated above, we have to hardcode 5.3.4. -->
    180179
    181180mkdir -pv                      /usr/share/doc/lua-&lua-version; &amp;&amp;
    … …  
    187186      Here we describe only the "Basic tests". Untar the tarball and
    188187      change to the
    189       <filename class="directory">lua-5.3.4-tests</filename> directory,
     188      <filename class="directory">lua-&lua-version;-tests</filename> directory,
    190189      then issue
    191190      <command>lua -e "_U=true" all.lua</command>. If the tests finish without
    … …  
    193192    </para>
    194193
    195   </sect2>
    196 
     194    <!-- The optimization problem fixed in the patch was identified by running
     195         the test suite, and ultimately culminated in a SIGBUS error. -->
     196  </sect2>
     197
     198  <!-- Brought into the patch, unneeded
    197199  <sect2 role="commands">
    198200    <title>Command Explanations</title>
    … …  
    210212
    211213  </sect2>
     214  -->
    212215
    213216  <sect2 role="content">

  • general/prog/lua52.xml

    r5ce1bdb reb7de89  
    172172ln -s liblua5.2.so install/usr/lib/liblua.so.&lua52-version; &amp;&amp;
    173173
    174 mv install/usr/share/man/man1/{lua.1,lua52.1} &amp;&amp;
    175 mv install/usr/share/man/man1/{luac.1,luac52.1}</userinput></screen>
     174mv install/usr/share/man/man1/{lua.1,lua5.2.1} &amp;&amp;
     175mv install/usr/share/man/man1/{luac.1,luac5.2.1}</userinput></screen>
    176176
    177177    <para>
    … …  
    209209      <seglistitem>
    210210        <seg>
    211           lua52 and luac52
     211          lua5.2 and luac5.2
    212212        </seg>
    213213        <seg>
    … …  
    235235          </para>
    236236          <indexterm zone="lua52 lua-prog">
    237             <primary sortas="b-lua52">lua52</primary>
     237            <primary sortas="b-lua52">lua5.2</primary>
    238238          </indexterm>
    239239        </listitem>
    … …  
    247247          </para>
    248248          <indexterm zone="lua52 luac52">
    249             <primary sortas="b-luac52">luac52</primary>
     249            <primary sortas="b-luac52">luac5.2</primary>
    250250          </indexterm>
    251251        </listitem>

  • introduction/welcome/changelog.xml

    r5ce1bdb reb7de89  
    4646      <itemizedlist>
    4747        <listitem>
     48          <para>[renodr] - Update to lua-5.4.0. Fixes
     49          <ulink url="&blfs-ticket-root;13742">#13742</ulink>.</para>
     50        </listitem>
     51        <listitem>
     52          <para>[renodr] - Adapt httpd to lua-5.4 API changes.</para>
     53        </listitem>
     54        <listitem>
     55          <para>[renodr] - Adapt gvim to lua-5.4 API changes.</para>
     56        </listitem>
     57        <listitem>
    4858          <para>[ken] - note that building rustc can now mostly be restricted to
    4959          a specified number of processors by adding a --jobs switch to each x.py

  • packages.ent

    r5ce1bdb reb7de89  
    338338<!ENTITY llvm-point-version           "0">
    339339<!ENTITY llvm-version                 "&llvm-majmin-version;.&llvm-point-version;">
    340 <!ENTITY lua-version                  "5.3.5">
     340<!ENTITY lua-version                  "5.4.0">
    341341<!ENTITY lua52-version                "5.2.4">
    342342<!ENTITY mercurial-version            "5.4.1">

  • postlfs/editors/vim.xml

    r5ce1bdb reb7de89  
    132132
    133133    <para>
     134      First, if you are building the Lua interpreter for VIM, adapt it to an
     135      API change in lua-5.4.0:
     136    </para>
     137
     138<screen><userinput remap="pre">sed -i '440 s/static int/int/' src/if_lua.c</userinput></screen>
     139
     140    <para>
    134141      Install <application>Vim</application> by running the following
    135142      commands:
    … …  
    239246
    240247    <para>
     248      <option>--enable-luainterp</option>,
    241249      <option>--enable-perlinterp</option>,
    242250      <option>--enable-pythoninterp</option>,
    243251      <option>--enable-tclinterp</option>,
    244252      <option>--enable-rubyinterp</option>:
    245       These options include the Perl, Python, Tcl, or Ruby interpreters that
     253      These options include the Lua, Perl, Python, Tcl, or Ruby interpreters that
    246254      allow using other application code in <application>vim</application>
    247255      scripts.

  • server/mail/dovecot.xml

    r5ce1bdb reb7de89  
    211211      <application>CLucene</application> full text search support.
    212212    </para>
     213   
     214    <para>
     215      <option>--with-lua</option>: This switch enables
     216      <application>Lua</application> plugin support. This includes
     217      a mail and push notification plugin.
     218    </para>
     219
    213220<!--
    214221    <para>

  • server/major/apache.xml

    r5ce1bdb reb7de89  
    130130useradd -c "Apache Server" -d /srv/www -g apache \
    131131        -s /bin/false -u 25 apache</userinput></screen>
     132
     133    <para>
     134      Adapt the Lua module to API changes in Lua-5.4:
     135    </para>
     136
     137<screen><userinput remap="pre">sed -i 's/lua_resume(a, NULL, b)/lua_resume(a, NULL, b, NULL)/' modules/lua/mod_lua.h</userinput></screen>
    132138
    133139    <para>

  • xsoft/other/hexchat.xml

    r5ce1bdb reb7de89  
    8383    <bridgehead renderas="sect4">Recommended</bridgehead>
    8484    <para role="recommended">
    85       <xref linkend="gtk2"/> and
     85      <xref linkend="gtk2"/>,
     86      <xref linkend="libcanberra"/>, and
    8687      <xref linkend="lua"/>
    8788    </para>
    … …  
    9192      <xref linkend="dbus-glib"/>,
    9293      <xref linkend="iso-codes"/>,
    93       <xref linkend="libcanberra"/>,
     94 <!-- <xref linkend="libcanberra"/>, -->
    9495      <xref linkend="libnotify"/>,
    9596      <xref linkend="pciutils"/>,
Note: See TracChangeset for help on using the changeset viewer.