Changeset 0313634


Ignore:
Timestamp:
03/10/2018 07:59:20 PM (7 years ago)
Author:
Pierre Labastie <pierre@…>
Branches:
2.4
Children:
72063a4
Parents:
61b7c59
Message:

Merge trunk r4024 and r4039, fixing generation of Makefile and of
DESTDIR install for libelf

Files:
2 edited

Legend:

Unmodified
Added
Removed

  • LFS/lfs.xsl

    r61b7c59 r0313634  
    605605        </xsl:choose>
    606606      </xsl:when>
    607       <xsl:otherwise> <!-- no make in this string -->
     607      <xsl:when test="contains($outputstring,'ninja ')">
     608        <xsl:choose>
     609          <xsl:when test="not(starts-with($outputstring,'ninja'))">
     610            <xsl:call-template name="outputpkgdest">
     611              <xsl:with-param name="outputstring"
     612                              select="substring-before($outputstring,'ninja')"/>
     613            </xsl:call-template>
     614            <xsl:call-template name="outputpkgdest">
     615              <xsl:with-param
     616                 name="outputstring"
     617                 select="substring-after($outputstring,
     618                                      substring-before($outputstring,'ninja'))"/>
     619            </xsl:call-template>
     620          </xsl:when>
     621          <xsl:otherwise> <!-- ninja is the first word -->
     622            <xsl:text>DESTDIR=$PKG_DEST ninja</xsl:text>
     623            <xsl:call-template name="outputpkgdest">
     624              <xsl:with-param
     625                  name="outputstring"
     626                  select="substring-after($outputstring,'ninja')"/>
     627            </xsl:call-template>
     628          </xsl:otherwise>
     629        </xsl:choose>
     630      </xsl:when>
     631      <xsl:otherwise> <!-- no make nor ninja in this string -->
    608632        <xsl:choose>
    609633          <xsl:when test="contains($outputstring,'&gt;/') and

  • common/libs/func_wrt_Makefile

    r61b7c59 r0313634  
    112112         ;;
    113113     glibc) echo $(grep "^glibc" $JHALFSDIR/pkg_tarball_list | head -n1 )
     114         ;;
     115     libelf) echo $(grep "^elfutils" $JHALFSDIR/pkg_tarball_list | head -n1 )
    114116         ;;
    115117     *)  echo $(grep "^$script_name[_-][[:digit:]]" $JHALFSDIR/pkg_tarball_list | head -n1 )
Note: See TracChangeset for help on using the changeset viewer.