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

merge trunk r4040 and r4044 to 2.4 branch

Browse source
This commit is contained in:
Pierre Labastie 2018-03-10 20:01:55 +00:00
parent 0313634ea2
commit 72063a43b4
1 changed files with 13 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
LFS/lfs.xsl
View file

@ -190,6 +190,13 @@ esac
@role='installation' and @role='installation' and
$pkgmngt = 'y'"> $pkgmngt = 'y'">
<xsl:text>mkdir -pv $PKG_DEST/usr/include/{rpc,rpcsvc} <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:text>
</xsl:if> </xsl:if>
<xsl:apply-templates <xsl:apply-templates
@ -604,21 +611,22 @@ unset OLD_PKGDIR
</xsl:otherwise> </xsl:otherwise>
</xsl:choose> </xsl:choose>
</xsl:when> </xsl:when>
<xsl:when test="contains($outputstring,'ninja ')"> <xsl:when test="contains($outputstring,'ninja install')">
<xsl:choose> <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:call-template name="outputpkgdest">
<xsl:with-param name="outputstring" <xsl:with-param name="outputstring"
select="substring-before($outputstring,'ninja')"/> select="substring-before($outputstring,'ninja install')"/>
</xsl:call-template> </xsl:call-template>
<xsl:call-template name="outputpkgdest"> <xsl:call-template name="outputpkgdest">
<xsl:with-param <xsl:with-param
name="outputstring" name="outputstring"
select="substring-after($outputstring, select="substring-after($outputstring,
substring-before($outputstring,'ninja'))"/> substring-before($outputstring,'ninja install'))"/>
</xsl:call-template> </xsl:call-template>
</xsl:when> </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:text>DESTDIR=$PKG_DEST ninja</xsl:text>
<xsl:call-template name="outputpkgdest"> <xsl:call-template name="outputpkgdest">
<xsl:with-param <xsl:with-param