zeroday0619/MahiroOS-jhalfs
Archived
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Only replace $(nproc) in scriptlets

Browse source 
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).
This commit is contained in:
Pierre Labastie 2023-11-15 18:10:07 +01:00
parent 645ec4780e
commit 3c43655ec6
2 changed files with 8 additions and 22 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
LFS/lfs.xsl
View file

@ -29,8 +29,7 @@
<xsl:param name="testsuite" select="1"/> <xsl:param name="testsuite" select="1"/>
<!-- Parallelism (LFS >= 12.1) --> <!-- Parallelism (LFS >= 12.1) -->
<xsl:param name="jobs_1" select="1"/> <xsl:param name="jobs" select="1"/>
<xsl:param name="jobs_2" select="1"/>
<!-- Install non wide character ncurses 5? --> <!-- Install non wide character ncurses 5? -->
<xsl:param name="ncurses5" select="'n'"/> <xsl:param name="ncurses5" select="'n'"/>
@ -621,11 +620,8 @@ unset OLD_PKGDIR
<xsl:when test="contains(string(.),'&lt;lfs&gt;')"> <xsl:when test="contains(string(.),'&lt;lfs&gt;')">
<xsl:value-of select="$hostname"/> <xsl:value-of select="$hostname"/>
</xsl:when> </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:when test="contains(string(.),'$(nproc)')">
<xsl:value-of select="$jobs_2"/> <xsl:value-of select="$jobs"/>
</xsl:when> </xsl:when>
<xsl:otherwise> <xsl:otherwise>
<xsl:text>**EDITME</xsl:text> <xsl:text>**EDITME</xsl:text>
@ -1092,14 +1088,6 @@ LOGLEVEL="</xsl:text>
<xsl:param name="instructions" select="''"/> <xsl:param name="instructions" select="''"/>
<xsl:param name="eof-seen" select="false()"/> <xsl:param name="eof-seen" select="false()"/>
<xsl:choose> <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:when test="contains($instructions,'&#xA;')">
<xsl:call-template name="comment-test"> <xsl:call-template name="comment-test">
<xsl:with-param name="instructions" <xsl:with-param name="instructions"

14
common/libs/func_book_parser
View file

@ -63,13 +63,12 @@ extract_commands() { #
fi fi
popd > /dev/null popd > /dev/null
JOBS_1=1 if [ "$ALL_CORES" = "y" ]; then
JOBS_2=1 JOBS="\$(nproc)"
case "$OPTIMIZE" in else
"1") JOBS_2="$N_PARALLEL";; JOBS="$N_PARALLEL"
"2") JOBS_1="$N_PARALLEL"; JOBS_2="$N_PARALLEL";;
esac
fi
# First profile the book, for revision and arch. Note that # First profile the book, for revision and arch. Note that
# MULTIBLIB is set to "default" if pure 64 bit book. In this case, # MULTIBLIB is set to "default" if pure 64 bit book. In this case,
# profiling on arch is useless, but does not hurt either. # profiling on arch is useless, but does not hurt either.
@ -109,8 +108,7 @@ extract_commands() { #
--stringparam local "$LOCAL" \ --stringparam local "$LOCAL" \
--stringparam log-level "$LOG_LEVEL" \ --stringparam log-level "$LOG_LEVEL" \
--stringparam script-root "$SCRIPT_ROOT" \ --stringparam script-root "$SCRIPT_ROOT" \
--stringparam jobs_1 "$JOBS_1" \ --stringparam jobs "$JOBS" \
--stringparam jobs_2 "$JOBS_2" \
--output "./${COMMANDS}/" \ --output "./${COMMANDS}/" \
$XSL \ $XSL \
prbook.xml >> $LOGDIR/$LOG 2>&1 prbook.xml >> $LOGDIR/$LOG 2>&1