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

Merge jhalfs 3667

Browse source
This commit is contained in:
Pierre Labastie 2013-03-13 16:48:19 +00:00
parent 2629bf2580
commit cbd04930b3
2 changed files with 22 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

29
LFS/lfs.xsl
View file

@ -192,8 +192,14 @@ esac
@role != 'nodump']/userinput[ @role != 'nodump']/userinput[
@remap='install']"> @remap='install']">
<xsl:if test="../@id = 'ch-system-man-pages'"> <xsl:if test="../@id = 'ch-system-man-pages'">
<!-- those files are provided by the shadow package --> <!-- these files are provided by the shadow package -->
<xsl:text>rm -fv $PKG_DEST/usr/share/man/{man3/getspnam.3,man5/passwd.5} <xsl:text>rm -fv $PKG_DEST/usr/share/man/{man3/getspnam.3,man5/passwd.5}
</xsl:text>
</xsl:if>
<!-- Attr man/man2 pages are already installed by man-pages. As of
March 2013, they are the same pages. Check it sometimes... -->
<xsl:if test="../@id = 'ch-system-attr'">
<xsl:text>rm -fv $PKG_DEST/usr/share/man/man2/*
</xsl:text> </xsl:text>
</xsl:if> </xsl:if>
<xsl:text>rm -fv $PKG_DEST/{,usr/}lib64 <xsl:text>rm -fv $PKG_DEST/{,usr/}lib64
@ -427,13 +433,11 @@ exit
<xsl:choose> <xsl:choose>
<xsl:when test="./literal"> <xsl:when test="./literal">
<xsl:call-template name="outputpkgdest"> <xsl:call-template name="outputpkgdest">
<xsl:with-param name="outputstring" <xsl:with-param name="outputstring" select="text()[1]"/>
select="text()[1]"/>
</xsl:call-template> </xsl:call-template>
<xsl:apply-templates select="literal"/> <xsl:apply-templates select="literal"/>
<xsl:call-template name="outputpkgdest"> <xsl:call-template name="outputpkgdest">
<xsl:with-param name="outputstring" <xsl:with-param name="outputstring" select="text()[2]"/>
select="text()[2]"/>
</xsl:call-template> </xsl:call-template>
</xsl:when> </xsl:when>
<xsl:otherwise> <xsl:otherwise>
@ -527,13 +531,20 @@ exit
'install')"/> 'install')"/>
<xsl:text>install&#xA;</xsl:text> <xsl:text>install&#xA;</xsl:text>
</xsl:when> </xsl:when>
<xsl:when test="ancestor::sect1[@id='ch-system-attr']">
<xsl:text>DIST_ROOT=$PKG_DEST make</xsl:text>
<xsl:call-template name="outputpkgdest">
<xsl:with-param name="outputstring"
select="substring-after($outputstring,'make')"/>
</xsl:call-template>
</xsl:when>
<xsl:otherwise> <xsl:otherwise>
<xsl:text>make DESTDIR=$PKG_DEST</xsl:text> <xsl:text>make DESTDIR=$PKG_DEST</xsl:text>
<xsl:call-template name="outputpkgdest"> <xsl:call-template name="outputpkgdest">>
<xsl:with-param <xsl:with-param
name="outputstring" name="outputstring"
select="substring-after($outputstring,'make')"/> select="substring-after($outputstring,'make')"/>
</xsl:call-template> </xsl:call-template>
</xsl:otherwise> </xsl:otherwise>
</xsl:choose> </xsl:choose>
</xsl:otherwise> </xsl:otherwise>

3
optimize/opt_config
View file

@ -16,7 +16,8 @@ MAKEFLAGS="-j3"
# This list may be different for you. # This list may be different for you.
# If your MAKEFLAGS don't contains a -jX option, you can set # If your MAKEFLAGS don't contains a -jX option, you can set
# a empty list here. # a empty list here.
BLACK_LIST="autoconf dejagnu gettext groff man-db vim" BLACK_LIST="attr autoconf dejagnu gettext groff man-db vim"
# Rationale for attr: the tests do not pass with -jX
#--- Default optimization mode #--- Default optimization mode
# This mode is overridden by definitions in opt_override; # This mode is overridden by definitions in opt_override;