Changeset e050677

Timestamp:

02/19/2019 06:05:57 AM (5 years ago)

Author:

Bruce Dubbs <bdubbs@…>

Branches:

10.0, 10.0-rc1, 10.1, 10.1-rc1, 11.0, 11.0-rc1, 11.0-rc2, 11.0-rc3, 11.1, 11.1-rc1, 11.2, 11.2-rc1, 11.3, 11.3-rc1, 12.0, 12.0-rc1, 12.1, 12.1-rc1, 8.4, 9.0, 9.1, arm, bdubbs/gcc13, ml-11.0, multilib, renodr/libudev-from-systemd, s6-init, trunk, xry111/arm64, xry111/arm64-12.0, xry111/clfs-ng, xry111/lfs-next, xry111/loongarch, xry111/loongarch-12.0, xry111/loongarch-12.1, xry111/mips64el, xry111/pip3, xry111/rust-wip-20221008, xry111/update-glibc

Children:

43eb476

Parents:

1d19f36

Message:

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

Files:

• chapter01/changelog.xml (modified) (2 diffs)
• chapter06/ninja.xml (modified) (3 diffs)
• general.ent (modified) (1 diff)

chapter01/changelog.xml

@@ -44 +44 @@
 -->
     <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>
@@ -59 +70 @@
 
     <listitem>
-      <para>2019-02-011</para>
+      <para>2019-02-11</para>
       <itemizedlist>
         <listitem>

chapter06/ninja.xml

@@ -40 +40 @@
   <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 
@@ -48 +48 @@
     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>
@@ -60 +60 @@
     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">patch -Np1 -i ../ninja-1.8.2-add_NINJAJOBS_var-1.patch</userinput></screen>
--->
+<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>
+
     <para>Build Ninja with:</para>
 

general.ent

@@ -1 @@
-<!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; -->