Add an optional modification to theh build procedure for ninja to allow use the

the environment variable NINJAJOBS.



git-svn-id: http://svn.linuxfromscratch.org/LFS/trunk/BOOK@11526 4aa44e1e-78dd-0310-a6d2-fbcd4c07a689

3 files changed, 30 insertions, 13 deletions

diff --git a/chapter01/changelog.xml b/chapter01/changelog.xml
index 390242f96..2d7ae0ddb 100644
--- a/chapter01/changelog.xml
+++ b/chapter01/changelog.xml
@@ -43,7 +43,18 @@
     appropriate for the entry or if needed the entire day's listitem.
 -->
     <listitem>
-      <para>2019-02-011</para>
+      <para>2019-02-19</para>
+      <itemizedlist>
+        <listitem>
+          <para>[bdubbs] - Add an optional modification to theh build
+          procedure for ninja to allow use the the environment
+          variable NINJAJOBS.</para>
+        </listitem>
+      </itemizedlist>
+    </listitem>
+
+    <listitem>
+      <para>2019-02-14</para>
       <itemizedlist>
         <listitem>
           <para>[bdubbs] - Update to linux-4.20.8. Fixes
@@ -58,7 +69,7 @@
     </listitem>
 
     <listitem>
-      <para>2019-02-011</para>
+      <para>2019-02-11</para>
       <itemizedlist>
         <listitem>
           <para>[bdubbs] - Update to linux-4.20.7. Fixes
diff --git a/chapter06/ninja.xml b/chapter06/ninja.xml
index 96533f1fe..5be498eb7 100644
--- a/chapter06/ninja.xml
+++ b/chapter06/ninja.xml
@@ -39,7 +39,7 @@
 
   <sect2 role="installation">
     <title>Installation of Ninja</title>
-<!--
+
     <para>When run, ninja normally runs a maximum number of processes
     in parallel.  By default this is the number of cores on the system 
     plus two.  In some cases this can overheat a CPU or run a system out
@@ -47,22 +47,28 @@
     will limit the number of parallel processes, but some packages
     embed the execution of ninja and do not pass a -j parameter.</para>
 
-    <para>Using the <emphasis>optional</emphasis> patch below allows a user to
+    <para>Using the <emphasis>optional</emphasis> procedure below allows a user to
     limit the number of parallel processes via an environment variable, 
-    NINJAJOBS.  <command>For example</command> setting:
+    NINJAJOBS.  <command>For example</command>, setting:
 
-     <!- - Using <command> here to make the output bold.  We really don't want
+     <!--Using <command> here to make the output bold.  We really don't want
      users setting this now and experience shows that many users blindly
-     copy/paste anything in a box. - ->
+     copy/paste anything in a box. -->
 
     <screen>export NINJAJOBS=4</screen>
 
     will limit ninja to four parallel processes.</para>
 
-    <para>If desired, install the patch by running:</para>
+    <para>If desired, add the capability to use the environment variable 
+    NINJAJOBS by running:</para>
+
+<screen><userinput remap="pre">sed -i '/int Guess/a \
+  int   j = 0;\
+  char* jobs = getenv( "NINJAJOBS" );\
+  if ( jobs != NULL ) j = atoi( jobs );\
+  if ( j > 0 ) return j;\
+' src/ninja.cc</userinput></screen>
 
-<screen><userinput remap="pre">patch -Np1 -i ../ninja-1.8.2-add_NINJAJOBS_var-1.patch</userinput></screen>
--->
     <para>Build Ninja with:</para>
 
 <screen><userinput remap="configure">python3 configure.py --bootstrap</userinput></screen>
diff --git a/general.ent b/general.ent
index 0c609c35f..52144ea8f 100644
--- a/general.ent
+++ b/general.ent
@@ -1,13 +1,13 @@
-<!ENTITY version         "SVN-20190214">
+<!ENTITY version         "SVN-20190219">
 <!ENTITY short-version   "svn">  <!-- Used below in &blfs-book; 
                                       Change to x.y for release but not -rc releases -->
 <!ENTITY generic-version "development"> <!-- Use "development"  or "x.y[-pre{x}]" -->
 
-<!ENTITY versiond        "20190214-systemd">
+<!ENTITY versiond        "20190219-systemd">
 <!ENTITY short-versiond  "systemd">
 <!ENTITY generic-versiond "systemd"> 
 
-<!ENTITY releasedate     "February 14, 2019">
+<!ENTITY releasedate     "February 19, 2019">
 
 <!ENTITY copyrightdate   "1999-2019"><!-- jhalfs needs a literal dash, not &ndash; -->
 <!ENTITY milestone       "8.4">