Эх сурвалжийг харах

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

Bruce Dubbs 6 жил өмнө
parent
commit
e050677ffb

+ 13 - 2
chapter01/changelog.xml

@@ -43,7 +43,18 @@
     appropriate for the entry or if needed the entire day's listitem.
     appropriate for the entry or if needed the entire day's listitem.
 -->
 -->
     <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>
       <itemizedlist>
         <listitem>
         <listitem>
           <para>[bdubbs] - Update to linux-4.20.8. Fixes
           <para>[bdubbs] - Update to linux-4.20.8. Fixes
@@ -58,7 +69,7 @@
     </listitem>
     </listitem>
 
 
     <listitem>
     <listitem>
-      <para>2019-02-011</para>
+      <para>2019-02-11</para>
       <itemizedlist>
       <itemizedlist>
         <listitem>
         <listitem>
           <para>[bdubbs] - Update to linux-4.20.7. Fixes
           <para>[bdubbs] - Update to linux-4.20.7. Fixes

+ 14 - 8
chapter06/ninja.xml

@@ -39,7 +39,7 @@
 
 
   <sect2 role="installation">
   <sect2 role="installation">
     <title>Installation of Ninja</title>
     <title>Installation of Ninja</title>
-<!--
+
     <para>When run, ninja normally runs a maximum number of processes
     <para>When run, ninja normally runs a maximum number of processes
     in parallel.  By default this is the number of cores on the system 
     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
     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
     will limit the number of parallel processes, but some packages
     embed the execution of ninja and do not pass a -j parameter.</para>
     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, 
     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
      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>
     <screen>export NINJAJOBS=4</screen>
 
 
     will limit ninja to four parallel processes.</para>
     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>
     <para>Build Ninja with:</para>
 
 
 <screen><userinput remap="configure">python3 configure.py --bootstrap</userinput></screen>
 <screen><userinput remap="configure">python3 configure.py --bootstrap</userinput></screen>

+ 3 - 3
general.ent

@@ -1,13 +1,13 @@
-<!ENTITY version         "SVN-20190214">
+<!ENTITY version         "SVN-20190219">
 <!ENTITY short-version   "svn">  <!-- Used below in &blfs-book; 
 <!ENTITY short-version   "svn">  <!-- Used below in &blfs-book; 
                                       Change to x.y for release but not -rc releases -->
                                       Change to x.y for release but not -rc releases -->
 <!ENTITY generic-version "development"> <!-- Use "development"  or "x.y[-pre{x}]" -->
 <!ENTITY generic-version "development"> <!-- Use "development"  or "x.y[-pre{x}]" -->
 
 
-<!ENTITY versiond        "20190214-systemd">
+<!ENTITY versiond        "20190219-systemd">
 <!ENTITY short-versiond  "systemd">
 <!ENTITY short-versiond  "systemd">
 <!ENTITY generic-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 copyrightdate   "1999-2019"><!-- jhalfs needs a literal dash, not &ndash; -->
 <!ENTITY milestone       "8.4">
 <!ENTITY milestone       "8.4">