Author: ken
Date: Mon Dec  9 22:12:19 2019
New Revision: 22459

Log:
Work around upstream's incompatible use of NINJAJOBS envvar in 
qtwebengine-5.13+.

Modified:
   trunk/BOOK/general.ent
   trunk/BOOK/introduction/welcome/changelog.xml
   trunk/BOOK/x/lib/qtwebengine.xml

Modified: trunk/BOOK/general.ent
==============================================================================
--- trunk/BOOK/general.ent      Mon Dec  9 18:26:18 2019        (r22458)
+++ trunk/BOOK/general.ent      Mon Dec  9 22:12:19 2019        (r22459)
@@ -1,6 +1,6 @@
 <!-- $LastChangedBy$ $Date$ -->
 
-<!ENTITY day          "10">                   <!-- Always 2 digits -->
+<!ENTITY day          "11">                   <!-- Always 2 digits -->
 <!ENTITY month        "12">                   <!-- Always 2 digits -->
 <!ENTITY year         "2019">
 <!ENTITY copyrightdate "2001-&year;">

Modified: trunk/BOOK/introduction/welcome/changelog.xml
==============================================================================
--- trunk/BOOK/introduction/welcome/changelog.xml       Mon Dec  9 18:26:18 
2019        (r22458)
+++ trunk/BOOK/introduction/welcome/changelog.xml       Mon Dec  9 22:12:19 
2019        (r22459)
@@ -41,6 +41,15 @@
       </itemizedlist>
     </listitem>
        -->
+    <listitem>
+      <para>December 11th, 2019</para>
+      <itemizedlist>
+        <listitem>
+          <para>[ken] - Work around upstream qtwebengine's use of a
+          NINJAJOBS environment variable, reported by Alain Dumont.</para>
+        </listitem>
+      </itemizedlist>
+    </listitem>
 
     <listitem>
       <para>December 10th, 2019</para>

Modified: trunk/BOOK/x/lib/qtwebengine.xml
==============================================================================
--- trunk/BOOK/x/lib/qtwebengine.xml    Mon Dec  9 18:26:18 2019        (r22458)
+++ trunk/BOOK/x/lib/qtwebengine.xml    Mon Dec  9 22:12:19 2019        (r22459)
@@ -199,6 +199,18 @@
   
src/3rdparty/chromium/third_party/blink/renderer/core/dom/document.cc</userinput></screen>
 
     <para>
+      Finally, fix a change in the build system which allows its developers to
+      pass e.g. -j20 to make (for quick tests of some areas) but breaks the
+      build with LFS's use of the NINJAJOBS environment variable:
+    </para>
+
+<!-- editors: See thread at
+http://lists.linuxfromscratch.org/pipermail/blfs-dev/2019-December/036996.html
+et.seq, particularly 037002.html which shows the commit near the end. -->
+
+<screen><userinput>sed -i 's/NINJAJOBS/NINJA_JOBS/' 
src/core/gn_run.pro</userinput></screen>
+
+    <para>
       If an older version of the package's main library has been installed,
       when the package is built separately it will link to that in preference
       to its own not-yet-installed version, and fail because of missing 
symbols.
-- 
http://lists.linuxfromscratch.org/listinfo/blfs-book
FAQ: http://www.linuxfromscratch.org/blfs/faq.html
Unsubscribe: See the above information page

Reply via email to