Author: pierre
Date: Sat Mar 10 12:01:55 2018
New Revision: 4056
Log:
merge trunk r4040 and r4044 to 2.4 branch
Modified:
jhalfs/branches/2.4/LFS/lfs.xsl
Modified: jhalfs/branches/2.4/LFS/lfs.xsl
==============================================================================
--- jhalfs/branches/2.4/LFS/lfs.xsl Sat Mar 10 11:59:20 2018 (r4055)
+++ jhalfs/branches/2.4/LFS/lfs.xsl Sat Mar 10 12:01:55 2018 (r4056)
@@ -192,6 +192,13 @@
<xsl:text>mkdir -pv $PKG_DEST/usr/include/{rpc,rpcsvc}
</xsl:text>
</xsl:if>
+ <xsl:if test="../@id = 'ch-system-libelf' and
+ @role='installation' and
+ $pkgmngt = 'y' and
+ $wrap-install = 'n'">
+ <xsl:text>mkdir -pv $PKG_DEST/usr/lib/pkgconfig
+</xsl:text>
+ </xsl:if>
<xsl:apply-templates
select=".//screen[(not(@role) or
@role != 'nodump') and
@@ -604,21 +611,22 @@
</xsl:otherwise>
</xsl:choose>
</xsl:when>
- <xsl:when test="contains($outputstring,'ninja ')">
+ <xsl:when test="contains($outputstring,'ninja install')">
<xsl:choose>
- <xsl:when test="not(starts-with($outputstring,'ninja'))">
+ <xsl:when test="not(starts-with($outputstring,'ninja install'))">
<xsl:call-template name="outputpkgdest">
<xsl:with-param name="outputstring"
-
select="substring-before($outputstring,'ninja')"/>
+ select="substring-before($outputstring,'ninja
install')"/>
</xsl:call-template>
<xsl:call-template name="outputpkgdest">
<xsl:with-param
name="outputstring"
select="substring-after($outputstring,
-
substring-before($outputstring,'ninja'))"/>
+ substring-before($outputstring,'ninja
install'))"/>
</xsl:call-template>
</xsl:when>
- <xsl:otherwise> <!-- ninja is the first word -->
+ <xsl:otherwise> <!-- "ninja" is the first word and is followed by
+ "install"-->
<xsl:text>DESTDIR=$PKG_DEST ninja</xsl:text>
<xsl:call-template name="outputpkgdest">
<xsl:with-param
--
http://lists.linuxfromscratch.org/listinfo/alfs-log
Unsubscribe: See the above information page
