Changeset 3c43655 for LFS/lfs.xsl

Timestamp:

11/15/2023 05:24:22 PM (8 months ago)

Author:

Pierre Labastie <pierre.labastie@…>

Branches:

ablfs-more, trunk

Children:

63190e6

Parents:

645ec47

git-author:

Pierre Labastie <pierre.labastie@…> (11/15/2023 05:10:07 PM)

git-committer:

Pierre Labastie <pierre.labastie@…> (11/15/2023 05:24:22 PM)

Message:

Only replace $(nproc) in scriptlets

There is no more $(nproc

echo 1). Note that we may replace

it with $(nproc) if using all cores, so don't replace it in
the comment-test template (otherwise we have infinite recursion).

File:

• LFS/lfs.xsl (modified) (3 diffs)

LFS/lfs.xsl

@@ -30 +30 @@
 
   <!-- Parallelism (LFS >= 12.1) -->
-  <xsl:param name="jobs_1" select="1"/>
-  <xsl:param name="jobs_2" select="1"/>
+  <xsl:param name="jobs" select="1"/>
 
   <!-- Install non wide character ncurses 5? -->
@@ -622 +621 @@
         <xsl:value-of select="$hostname"/>
       </xsl:when>
-      <xsl:when test="contains(string(.),'$(nproc || echo 1)')">
-        <xsl:value-of select="$jobs_1"/>
-      </xsl:when>
       <xsl:when test="contains(string(.),'$(nproc)')">
-        <xsl:value-of select="$jobs_2"/>
+        <xsl:value-of select="$jobs"/>
       </xsl:when>
       <xsl:otherwise>
@@ -1093 +1089 @@
     <xsl:param name="eof-seen" select="false()"/>
     <xsl:choose>
-      <xsl:when test="contains($instructions, '$(nproc)')">
-        <xsl:call-template name="comment-test">
-          <xsl:with-param
-            name="instructions"
-            select="concat(substring-before($instructions, '$(nproc)'), $jobs_2, substring-after($instructions, '$(nproc)'))"/>
-          <xsl:with-param name="eof-seen" select="$eof-seen"/>
-        </xsl:call-template>
-      </xsl:when>
       <xsl:when test="contains($instructions,'&#xA;')">
         <xsl:call-template name="comment-test">