diff options
| author | Pierre Labastie <pierre@linuxfromscratch.org> | 2018-03-10 19:59:20 +0000 |
|---|---|---|
| committer | Pierre Labastie <pierre@linuxfromscratch.org> | 2018-03-10 19:59:20 +0000 |
| commit | 0313634ea24b5cb223561a62132769c49d498928 (patch) | |
| tree | d37fac58c6d340251c540c4dac70632becd51233 | |
| parent | 61b7c59ffa6fc81ab43eb38cd8815836c8a85111 (diff) | |
Merge trunk r4024 and r4039, fixing generation of Makefile and of
DESTDIR install for libelf
| -rw-r--r-- | LFS/lfs.xsl | 26 | ||||
| -rw-r--r-- | common/libs/func_wrt_Makefile | 2 |
2 files changed, 27 insertions, 1 deletions
diff --git a/LFS/lfs.xsl b/LFS/lfs.xsl index 5cfd2fd136..590fafb59d 100644 --- a/LFS/lfs.xsl +++ b/LFS/lfs.xsl @@ -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,'>/') and not(contains(substring-before($outputstring,'>/'),' /'))"> diff --git a/common/libs/func_wrt_Makefile b/common/libs/func_wrt_Makefile index c4faf8a67b..64c343c89b 100644 --- a/common/libs/func_wrt_Makefile +++ b/common/libs/func_wrt_Makefile @@ -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 |