Author: pierre Date: Mon May 18 01:31:43 2020 New Revision: 4160 Log: Add -j1 to "make install" in the lfs book (done long ago in blfs)
Modified: jhalfs/trunk/LFS/lfs.xsl Modified: jhalfs/trunk/LFS/lfs.xsl ============================================================================== --- jhalfs/trunk/LFS/lfs.xsl Fri May 8 01:22:55 2020 (r4159) +++ jhalfs/trunk/LFS/lfs.xsl Mon May 18 01:31:43 2020 (r4160) @@ -442,6 +442,7 @@ </xsl:when> <!-- Package management --> <!-- Add $PKG_DEST to installation commands --> +<!-- Also add -j1 to make install --> <xsl:when test="@remap='install' and not(ancestor::chapter[ @id='chapter-temporary-tools' @@ -454,6 +455,12 @@ <xsl:apply-templates/> <xsl:text>
fi
</xsl:text> </xsl:when> + <xsl:when test="contains(string(),'make ')"> + <xsl:copy-of select="substring-before(string(), 'make ')"/> + <xsl:text>make -j1 </xsl:text> + <xsl:copy-of select="substring-after(string(), 'make ')"/> + <xsl:text>
</xsl:text> + </xsl:when> <xsl:otherwise> <xsl:apply-templates/> <xsl:text>
</xsl:text> @@ -499,7 +506,7 @@ <xsl:text>
</xsl:text> </xsl:otherwise> </xsl:choose> - </xsl:when> <!-- @remap='install' --> + </xsl:when> <!-- @remap='install' and not temporary tools --> <!-- if package management, we should make an independant package for tzdata. --> <xsl:when test="contains(string(),'tzdata') and $pkgmngt='y'"> @@ -546,6 +553,21 @@ </xsl:text> </xsl:when><!-- addition for tzdata + package management --> <!-- End addition for package management --> + <!-- add -j1 to make install in chapter 5 --> + <xsl:when test="ancestor::chapter[@id='chapter-temporary-tools'] and + @remap='install'"> + <xsl:choose> + <xsl:when test="contains(string(),'make ')"> + <xsl:copy-of select="substring-before(string(), 'make ')"/> + <xsl:text>make -j1 </xsl:text> + <xsl:copy-of select="substring-after(string(), 'make ')"/> + </xsl:when> + <xsl:otherwise> + <xsl:apply-templates/> + </xsl:otherwise> + </xsl:choose> + <xsl:text>
</xsl:text> + </xsl:when><!-- chapter 5 install --> <!-- The rest of commands --> <xsl:otherwise> <xsl:apply-templates/> @@ -913,34 +935,34 @@ <xsl:text>install
</xsl:text> </xsl:when> <xsl:when test="ancestor::sect1[@id='ch-system-bzip2']"> - <xsl:text>make PREFIX=$PKG_DEST/usr install
</xsl:text> + <xsl:text>make -j1 PREFIX=$PKG_DEST/usr install
</xsl:text> </xsl:when> <xsl:when test="ancestor::sect1[@id='ch-system-sysklogd']"> - <xsl:text>make BINDIR=$PKG_DEST/sbin prefix=$PKG_DEST install
</xsl:text> + <xsl:text>make -j1 BINDIR=$PKG_DEST/sbin prefix=$PKG_DEST install
</xsl:text> </xsl:when> <xsl:when test="ancestor::sect1[@id='ch-system-iproute2']"> - <xsl:text>make DESTDIR=$PKG_DEST DOCDIR=</xsl:text> + <xsl:text>make -j1 DESTDIR=$PKG_DEST DOCDIR=</xsl:text> <xsl:value-of select="substring-before(substring-after(string(),'DOCDIR='), 'install')"/> <xsl:text>install
</xsl:text> </xsl:when> <xsl:when test="ancestor::sect1[@id='ch-system-sysvinit']"> - <xsl:text>make ROOT=$PKG_DEST</xsl:text> + <xsl:text>make -j1 ROOT=$PKG_DEST</xsl:text> <xsl:value-of select="substring-before(substring-after(string(),'make'), 'install')"/> <xsl:text>install
</xsl:text> </xsl:when> <xsl:when test="ancestor::sect1[@id='ch-bootable-kernel']"> - <xsl:text>make INSTALL_MOD_PATH=$PKG_DEST</xsl:text> + <xsl:text>make -j1 INSTALL_MOD_PATH=$PKG_DEST</xsl:text> <xsl:value-of select="substring-before(substring-after(string(),'make'), 'install')"/> <xsl:text>install
</xsl:text> </xsl:when> <xsl:otherwise> - <xsl:text>make DESTDIR=$PKG_DEST</xsl:text> + <xsl:text>make -j1 DESTDIR=$PKG_DEST</xsl:text> <xsl:call-template name="outputpkgdest"> <xsl:with-param name="outputstring" -- http://lists.linuxfromscratch.org/listinfo/alfs-log Unsubscribe: See the above information page