Changeset ae5a7024

Timestamp:

02/14/2016 04:24:59 PM (8 years ago)

Author:

Fernando de Oliveira <fernando@…>

Branches:

10.0, 10.1, 11.0, 11.1, 11.2, 11.3, 12.0, 12.1, 7.10, 7.9, 8.0, 8.1, 8.2, 8.3, 8.4, 9.0, 9.1, basic, bdubbs/svn, elogind, kea, ken/TL2024, ken/inkscape-core-mods, ken/tuningfonts, lazarus, lxqt, nosym, perl-modules, 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:

2db87f5

Parents:

3bd40abd

Message:

• Lua-5.3.2 and VLC-2.2.2 need to be compiled with Lua compat 5.1

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

Files:

• general/prog/lua.xml (modified) (3 diffs)
• introduction/welcome/changelog.xml (modified) (1 diff)
• multimedia/videoutils/vlc.xml (modified) (2 diffs)

general/prog/lua.xml

@@ -120 +120 @@
     <title>Installation of Lua</title>
 
-    <para>
-      Install <application>Lua</application> by running the following
-      commands:
-    </para>
-
-<screen><userinput>patch -Np1 -i ../lua-&lua-version;-shared_library-1.patch &amp;&amp;
-
-sed -i '/#define LUA_ROOT/s:/usr/local/:/usr/:' src/luaconf.h &amp;&amp;
-
-make MYCFLAGS="-DLUA_COMPAT_5_1" linux</userinput></screen>
-
-    <para>
-      To test the results, issue: <command>make test</command>.
-      <quote>This will run the interpreter and print its version.</quote>.
-      More comprehensive tests can be performed if you downloaded the "Test
-      suite" tarball. Those tests need to be executed after the package is
-      installed, thus we defer to describe then below.
-    </para>
-
-    <para>
-      Now, as the <systemitem class="username">root</systemitem> user:
-    </para>
-
-<screen role="root"><userinput>make INSTALL_TOP=/usr TO_LIB="liblua.so liblua.so.5.3 liblua.so.&lua-version;" \
-     INSTALL_DATA="cp -d" INSTALL_MAN=/usr/share/man/man1 install &amp;&amp;
-
-mkdir -pv /usr/share/doc/lua-&lua-version; &amp;&amp;
-cp -v doc/*.{html,css,gif,png} /usr/share/doc/lua-&lua-version;</userinput></screen>
-
     <para>Some packages check for the <application>pkg-config</application> file
-    for <application>Lua</application>. As the
-    <systemitem class="username">root</systemitem> user:</para>
-
-<screen role="root"><userinput>cat &gt; /usr/lib/pkgconfig/lua.pc &lt;&lt; "EOF"
+    for <application>Lua</application>, wich is created with:</para>
+
+<screen role="root"><userinput>cat &gt; lua.pc &lt;&lt; "EOF"
 <literal>V=5.3
 R=&lua-version;
@@ -177 +147 @@
 
     <para>
+      Install <application>Lua</application> by running the following
+      commands:
+    </para>
+
+<screen><userinput>patch -Np1 -i ../lua-&lua-version;-shared_library-1.patch &amp;&amp;
+
+sed -i '/#define LUA_ROOT/s:/usr/local/:/usr/:' src/luaconf.h &amp;&amp;
+
+make MYCFLAGS="-DLUA_COMPAT_5_2 -DLUA_COMPAT_5_1" linux</userinput></screen>
+
+    <para>
+      To test the results, issue: <command>make test</command>.
+      <quote>This will run the interpreter and print its version.</quote>.
+      More comprehensive tests can be performed if you downloaded the "Test
+      suite" tarball. Those tests need to be executed after the package is
+      installed, thus we defer to describe then below.
+    </para>
+
+    <para>
+      Now, as the <systemitem class="username">root</systemitem> user:
+    </para>
+
+<screen role="root"><userinput>make INSTALL_TOP=/usr TO_LIB="liblua.so liblua.so.5.3 liblua.so.&lua-version;" \
+     INSTALL_DATA="cp -d" INSTALL_MAN=/usr/share/man/man1 install &amp;&amp;
+
+mkdir -pv /usr/share/doc/lua-&lua-version; &amp;&amp;
+cp -v doc/*.{html,css,gif,png} /usr/share/doc/lua-&lua-version; &amp;&amp;
+
+install -v -m644 -D lua.pc /usr/lib/pkgconfig/lua.pc</userinput></screen>
+
+    <para>
       We are going to describe only the "Basic tests". Untar the tarball and
       change to the
@@ -197 +198 @@
 
     <para>
-      <parameter>MYCFLAGS="-DLUA_COMPAT_5_1"</parameter>: This parameter
-      enables building of the <application>Lua</application> 5.1
-      functions into the shared library to allow applications which
-      still require them to function properly.
+      <envar>MYCFLAGS="-DLUA_COMPAT_5_2 -DLUA_COMPAT_5_1"</envar>: This
+      environment variable includes compatibility layers with Lua 5.1 and 5.2
+      in the build.
     </para>
 

introduction/welcome/changelog.xml

@@ -49 +49 @@
       <itemizedlist>
         <listitem>
-          <para>[krejzi] - Fixed Lua instructions to enable
-          building of the Lua 5.1 compatibility functions. Fixes
-          <ulink url="&blfs-ticket-root;7462">#7462</ulink>.</para>
+          <para>[fernando] - Lua-5.3.2 and VLC-2.2.2 need to be compiled with
+          Lua compat 5.1. Fixes
+          <ulink url="&blfs-ticket-root;7462">#7462</ulink> and
+          <ulink url="&blfs-ticket-root;7465">#7465</ulink>.</para>
         </listitem>
         <listitem>

multimedia/videoutils/vlc.xml

@@ -221 +221 @@
 
     <para>
+      If you wish to avoid thousands of annoying warnings, issue:
+    </para>
+
+<screen><userinput>sed -i 's/ifndef __FAST_MATH__/if 0/g' configure.ac</userinput></screen>
+
+    <para>
       Install <application>VLC</application> by running the following commands:
     </para>
@@ -242 +248 @@
 
 sed -e '/seems to be moved/s/^/#/' \
-    -i autotools/ltmain.sh libtool &amp;&amp;
-
-make</userinput></screen>
+    -i autotools/ltmain.sh libtool &amp;&amp;</userinput></screen>
+
+    <para>
+      In order to build with Lua 5.1 compatiblity, issue:
+    </para>
+
+<screen><userinput>CFLAGS='-fPIC -O2 -Wall -Wextra -DLUA_COMPAT_5_1' make </userinput></screen>
 
     <para>