Ignore:
Timestamp:
Oct 10, 2012, 6:42:21 PM (12 years ago)
Author:
Chris Staub <chris@…>
Branches:
clfs-2.1, clfs-3.0.0-systemd, clfs-3.0.0-sysvinit, master, systemd, sysvinit
Children:
f7b2c72
Parents:
0cce40d (diff), 80cbd64 (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 git.cross-lfs.org:cross-lfs

File:
1 edited

Legend:

Unmodified
Added
Removed
  • BOOK/boot/multilib/e2fsprogs.xml

    r0cce40d r73ace20  
    5555    xpointer="xpointer(//*[@os='f'])"/>
    5656
    57     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
    58     href="../common/e2fsprogs.xml"
    59     xpointer="xpointer(//*[@os='g'])"/>
     57<screen os="g"><userinput>make LIBUUID="-luuid" STATIC_LIBUUID="-luuid" \
     58    LIBBLKID="-lblkid" STATIC_LIBBLKID="-lblkid" \
     59    LDFLAGS="-Wl,-rpath,/tools/lib64"</userinput></screen>
    6060
    6161    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
Note: See TracChangeset for help on using the changeset viewer.