Changeset 7782c77


Ignore:
Timestamp:
Jun 4, 2011, 8:24:34 AM (13 years ago)
Author:
Joe Ciccone <jciccone@…>
Branches:
clfs-1.2, clfs-2.1, clfs-3.0.0-systemd, clfs-3.0.0-sysvinit, master, systemd, sysvinit
Children:
04b4d8a
Parents:
d63b7ee
Message:

Cleanup Util-Linux-NG in the boot section.

Location:
BOOK/boot
Files:
3 edited

Legend:

Unmodified
Added
Removed
  • BOOK/boot/64/util-linux.xml

    rd63b7ee r7782c77  
    2727    xpointer="xpointer(//*[@os='a'])"/>
    2828
    29 <screen os="be"><userinput>CC="${CC} ${BUILD64}" ./configure --build=${CLFS_HOST} \
    30     --host=${CLFS_TARGET} --enable-login-utils \
    31     --disable-makeinstall-chown</userinput></screen>
     29<screen os="be"><userinput>CC="${CC} ${BUILD64}" PKG_CONFIG=true \
     30  ./configure --prefix=/tools --exec-prefix=/tools \
     31    --build=${CLFS_HOST} --host=${CLFS_TARGET} \
     32    --enable-login-utils --disable-makeinstall-chown</userinput></screen>
    3233
    3334    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     
    4748    xpointer="xpointer(//*[@os='h'])"/>
    4849
    49     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
    50     href="../common/util-linux.xml"
    51     xpointer="xpointer(//*[@os='i'])"/>
    52 
    53     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
    54     href="../common/util-linux.xml"
    55     xpointer="xpointer(//*[@os='j'])"/>
    56 
    5750  </sect2>
    5851
  • BOOK/boot/common/util-linux.xml

    rd63b7ee r7782c77  
    2727    xpointer="xpointer(//*[@os='a'])"/>
    2828
    29 <screen os="b"><userinput>./configure --build=${CLFS_HOST} \
    30     --host=${CLFS_TARGET} --enable-login-utils \
    31     --disable-makeinstall-chown</userinput></screen>
     29<screen os="b"><userinput>PKG_CONFIG=true \
     30  ./configure --prefix=/tools --exec-prefix=/tools \
     31    --build=${CLFS_HOST} --host=${CLFS_TARGET} \
     32    --enable-login-utils --disable-makeinstall-chown</userinput></screen>
    3233
    3334    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     
    4142    xpointer="xpointer(//*[@os='g'])"/>
    4243
    43 <screen os="h"><userinput>make DESTDIR=${CLFS} install</userinput></screen>
    44 
    45   <para os="i">Copy Libraries and includes to /tools:</para>
    46 
    47 <screen os="j"><userinput>rm -fv ${CLFS}/usr/lib/lib{blkid,uuid}.la
    48 cp -v ${CLFS}/usr/lib/lib{blkid,uuid}* /tools/lib
    49 cp -v ${CLFS}/lib/lib{blkid,uuid}* /tools/lib
    50 ln -sfv libblkid.so.&util-linux-blkid-id; /tools/lib/libblkid.so
    51 ln -sfv libuuid.so.&util-linux-uuid-id; /tools/lib/libuuid.so
    52 install -dv /tools/include/{blkid,uuid}
    53 cp -av ${CLFS}/usr/include/blkid/* /tools/include/blkid/
    54 cp -av ${CLFS}/usr/include/uuid/* /tools/include/uuid/</userinput></screen>
     44<screen os="h"><userinput>make install</userinput></screen>
    5545
    5646  </sect2>
  • BOOK/boot/multilib/util-linux.xml

    rd63b7ee r7782c77  
    2727    xpointer="xpointer(//*[@os='a'])"/>
    2828
    29 <screen os="be"><userinput>CC="${CC} ${BUILD64}" ./configure --build=${CLFS_HOST} \
    30     --host=${CLFS_TARGET} --libdir=/lib64 --enable-login-utils \
     29<screen os="be"><userinput>CC="${CC} ${BUILD64}" PKG_CONFIG=true \
     30  ./configure \
     31    --prefix=/tools --exec-prefix=/tools \
     32    --build=${CLFS_HOST} --host=${CLFS_TARGET} \
     33    --libdir=/tools/lib64 --enable-login-utils \
    3134    --disable-makeinstall-chown</userinput></screen>
    3235
     
    4750    xpointer="xpointer(//*[@os='h'])"/>
    4851
    49     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
    50     href="../common/util-linux.xml"
    51     xpointer="xpointer(//*[@os='i'])"/>
    52 
    53 <screen os="j"><userinput>rm -fv ${CLFS}/usr/lib64/lib{blkid,uuid}.la
    54 cp -v ${CLFS}/usr/lib64/lib{blkid,uuid}* /tools/lib64
    55 cp -v ${CLFS}/lib64/lib{blkid,uuid}* /tools/lib64
    56 ln -sfv libblkid.so.&util-linux-blkid-id; /tools/lib64/libblkid.so
    57 ln -sfv libuuid.so.&util-linux-uuid-id; /tools/lib64/libuuid.so
    58 install -dv /tools/include/{blkid,uuid}
    59 cp -av ${CLFS}/usr/include/blkid/* /tools/include/blkid/
    60 cp -av ${CLFS}/usr/include/uuid/* /tools/include/uuid/</userinput></screen>
    61 
    6252  </sect2>
    6353
Note: See TracChangeset for help on using the changeset viewer.