Changeset 04a608b

Timestamp:

11/17/2023 02:57:55 PM (6 months ago)

Author:

Pierre Labastie <pierre.labastie@…>

Branches:

ablfs-more, trunk

Children:

924076f

Parents:

a9360e1

Message:

Pass NINJAJOBS if N_PARALLEL is defined

Now that MAKEFLAGS is defined at the beginning of the scriptlet,
there is no need to pass MAKEFLAGS as an envar to the scriptlet.
But still NINJAJOBS is not defined. In most cases, when we want
to use all cores, this is not a problem. But if N_PARALLEL is
defined, it needs to be passed. Note that we also pass
MAKEFLAGS in this case, because we use the old "wrt_xxx" function,
but it is not used.

File:

• LFS/master.sh (modified) (2 diffs)

LFS/master.sh

@@ -132 +132 @@
           *)  wrt_optimize "$name" ;;
       esac
-      # MAKEFLAGS is set even if no optimization now.
-      # For new books, the scripts contain the MAKEFLAGS, so no
-      # need to set them in the envars except if binutils-pass1
-      # and REALSBU=y. For Old books, N_PARALLEL and JH_MAKEFLAGS
-      # are set and we must set the envars.
-      case "${mkf_included}${this_script}${REALSBU}" in
-          *binutils-pass1y)
-              wrt_makeflags "$name" "-j1" "1" ;;
-          n*)
-              wrt_makeflags "$name" "$JH_MAKEFLAGS" "$N_PARALLEL" ;;
-      esac
-    fi
+      # There is no need to tweak MAKEFLAGS anymore, this is done
+      # by lfs.xsl. But still, NINJAJOBS needs to be set if
+      # N_PARALLEL is defined.
+      if [ -n "N_PARALLEL" ]; then
+         wrt_makeflags "$name" "$JH_MAKEFLAGS" "$N_PARALLEL"
+      fi
+    fi # end of package specific instructions
 
 # Some scriptlet have a special treatment; otherwise standard
@@ -260 +255 @@
 #  echo nb_chaps: $nb_chaps
 # end DEBUG
-
-  # We need to know if we have an old or a new book (with included MAKEFLAGS)
-  # we grep for MAKEFLAGS in chapter04 to find out.
-  if grep -q MAKEFLAGS chapter04/*; then
-          mkf_included=y
-  else
-          mkf_included=n
-  fi
 
   # Make a temporary file with all script targets