Changeset 1b02a9a for LFS/lfs.xsl

Timestamp:

09/11/2023 08:04:44 AM (10 months ago)

Author:

Xi Ruoyao <xry111@…>

Branches:

ablfs-more, trunk

Children:

74601a7

Parents:

4ba94ad

git-author:

Xi Ruoyao <xry111@…> (09/11/2023 06:38:15 AM)

git-committer:

Xi Ruoyao <xry111@…> (09/11/2023 08:04:44 AM)

Message:

Replace $(nproc

echo 1) and $(nproc)

File:

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

LFS/lfs.xsl

@@ -28 +28 @@
   -->
   <xsl:param name="testsuite" select="1"/>
+
+  <!-- Parallelism (LFS >= 12.1) -->
+  <xsl:param name="jobs_1" select="1"/>
+  <xsl:param name="jobs_2" select="1"/>
 
   <!-- Install non wide character ncurses 5? -->
@@ -616 +620 @@
         <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:when>
       <xsl:otherwise>
         <xsl:text>**EDITME</xsl:text>
@@ -1081 +1091 @@
     <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">