Changeset b9fa514 for BOOK/final-system


Ignore:
Timestamp:
Jul 2, 2017, 9:55:35 PM (7 years ago)
Author:
Chris Staub <chris@…>
Branches:
master, systemd
Children:
24c892d
Parents:
b9cf596 (diff), ce6b8dc (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.
Message:

Merge branch 'master' of clfs.org:cross-lfs

Location:
BOOK/final-system
Files:
2 edited

Legend:

Unmodified
Added
Removed

  • BOOK/final-system/common/diffutils.xml

    rb9cf596 rb9fa514  
    2929
    3030<screen os="s2"><userinput>sed -i 's:= @mkdir_p@:= /bin/mkdir -p:' po/Makefile.in.in</userinput></screen>
    31 
    32     <para os="s3">Adjust the source to build with the included GNULIB code:</para>
    33 
    34 <screen os="s4"><userinput>sed -i '233,237 s/max)/max) \\/' lib/intprops.h</userinput></screen>
    3531
    3632    <para os="a">Prepare Diffutils for compilation:</para>

  • BOOK/final-system/multilib/diffutils.xml

    rb9cf596 rb9fa514  
    2929    href="../common/diffutils.xml"
    3030    xpointer="xpointer(//*[@os='s2'])"/>
    31 
    32     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
    33     href="../common/diffutils.xml"
    34     xpointer="xpointer(//*[@os='s3'])"/>
    35 
    36     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
    37     href="../common/diffutils.xml"
    38     xpointer="xpointer(//*[@os='s4'])"/>
    3931
    4032    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
Note: See TracChangeset for help on using the changeset viewer.