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

Merge trunk r4024 and r4039, fixing generation of Makefile and of

Browse source 
DESTDIR install for libelf
This commit is contained in:
Pierre Labastie 2018-03-10 19:59:20 +00:00
parent 61b7c59ffa
commit 0313634ea2
2 changed files with 27 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

26
LFS/lfs.xsl
View file

@ -604,7 +604,31 @@ unset OLD_PKGDIR
</xsl:otherwise>
</xsl:choose>
</xsl:when>
<xsl:otherwise> <!-- no make in this string -->
<xsl:when test="contains($outputstring,'ninja ')">
<xsl:choose>
<xsl:when test="not(starts-with($outputstring,'ninja'))">
<xsl:call-template name="outputpkgdest">
<xsl:with-param name="outputstring"
select="substring-before($outputstring,'ninja')"/>
</xsl:call-template>
<xsl:call-template name="outputpkgdest">
<xsl:with-param
name="outputstring"
select="substring-after($outputstring,
substring-before($outputstring,'ninja'))"/>
</xsl:call-template>
</xsl:when>
<xsl:otherwise> <!-- ninja is the first word -->
<xsl:text>DESTDIR=$PKG_DEST ninja</xsl:text>
<xsl:call-template name="outputpkgdest">
<xsl:with-param
name="outputstring"
select="substring-after($outputstring,'ninja')"/>
</xsl:call-template>
</xsl:otherwise>
</xsl:choose>
</xsl:when>
<xsl:otherwise> <!-- no make nor ninja in this string -->
<xsl:choose>
<xsl:when test="contains($outputstring,'&gt;/') and
not(contains(substring-before($outputstring,'&gt;/'),' /'))">

2
common/libs/func_wrt_Makefile
View file

@ -112,6 +112,8 @@ get_package_tarball_name() { #
;;
glibc) echo $(grep "^glibc" $JHALFSDIR/pkg_tarball_list | head -n1 )
;;
libelf) echo $(grep "^elfutils" $JHALFSDIR/pkg_tarball_list | head -n1 )
;;
*) echo $(grep "^$script_name[_-][[:digit:]]" $JHALFSDIR/pkg_tarball_list | head -n1 )
;;
esac