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
This commit is contained in:
Ken Moffat 2019-12-10 06:12:19 +00:00
parent 4ce96fe001
commit e90b81dab7
3 changed files with 22 additions and 1 deletions

View File

@ -1,6 +1,6 @@
<!-- $LastChangedBy$ $Date$ --> <!-- $LastChangedBy$ $Date$ -->
<!ENTITY day "10"> <!-- Always 2 digits --> <!ENTITY day "11"> <!-- Always 2 digits -->
<!ENTITY month "12"> <!-- Always 2 digits --> <!ENTITY month "12"> <!-- Always 2 digits -->
<!ENTITY year "2019"> <!ENTITY year "2019">
<!ENTITY copyrightdate "2001-&year;"> <!ENTITY copyrightdate "2001-&year;">

View File

@ -41,6 +41,15 @@
</itemizedlist> </itemizedlist>
</listitem> </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> <listitem>
<para>December 10th, 2019</para> <para>December 10th, 2019</para>

View File

@ -198,6 +198,18 @@ followed by a comment, the second lacks the ';' -->
<screen><userinput>sed -i '5713s/.*/&amp;;/' \ <screen><userinput>sed -i '5713s/.*/&amp;;/' \
src/3rdparty/chromium/third_party/blink/renderer/core/dom/document.cc</userinput></screen> 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> <para>
If an older version of the package's main library has been installed, 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 when the package is built separately it will link to that in preference