Changeset e90b81d

Timestamp:

12/10/2019 06:12:19 AM (5 years ago)

Author:

Ken Moffat <ken@…>

Branches:

10.0, 10.1, 11.0, 11.1, 11.2, 11.3, 12.0, 12.1, 12.2, 9.1, gimp3, 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/for-12.3, xry111/intltool, xry111/llvm18, xry111/soup3, xry111/spidermonkey128, xry111/test-20220226, xry111/xf86-video-removal

Children:

861bbbc

Parents:

4ce96fe

Message:

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

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

Files:

• general.ent (modified) (1 diff)
• introduction/welcome/changelog.xml (modified) (1 diff)
• x/lib/qtwebengine.xml (modified) (1 diff)

general.ent

@@ -1 +1 @@
 <!-- $LastChangedBy$ $Date$ -->
 
-<!ENTITY day          "10">                   <!-- Always 2 digits -->
+<!ENTITY day          "11">                   <!-- Always 2 digits -->
 <!ENTITY month        "12">                   <!-- Always 2 digits -->
 <!ENTITY year         "2019">

introduction/welcome/changelog.xml

@@ -42 +42 @@
     </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>

x/lib/qtwebengine.xml

@@ -198 +198 @@
 <screen><userinput>sed -i '5713s/.*/&amp;;/' \
   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>