[alfs-log] r4055 - in jhalfs/branches/2.4: LFS common/libs

[pierre]

Author: pierre
Date: Sat Mar 10 11:59:20 2018
New Revision: 4055

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

Modified:
   jhalfs/branches/2.4/LFS/lfs.xsl
   jhalfs/branches/2.4/common/libs/func_wrt_Makefile

Modified: jhalfs/branches/2.4/LFS/lfs.xsl
==============================================================================
--- jhalfs/branches/2.4/LFS/lfs.xsl     Sat Mar 10 06:30:21 2018        (r4054)
+++ jhalfs/branches/2.4/LFS/lfs.xsl     Sat Mar 10 11:59:20 2018        (r4055)
@@ -604,7 +604,31 @@
           </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;/'),' /'))">

Modified: jhalfs/branches/2.4/common/libs/func_wrt_Makefile
==============================================================================
--- jhalfs/branches/2.4/common/libs/func_wrt_Makefile   Sat Mar 10 06:30:21 
2018        (r4054)
+++ jhalfs/branches/2.4/common/libs/func_wrt_Makefile   Sat Mar 10 11:59:20 
2018        (r4055)
@@ -112,6 +112,8 @@
          ;;
      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
-- 
http://lists.linuxfromscratch.org/listinfo/alfs-log
Unsubscribe: See the above information page