Changeset 9597c5a for BOOK/boot


Ignore:
Timestamp:
May 18, 2014, 8:25:27 PM (11 years ago)
Author:
Chris Staub <chris@…>
Branches:
clfs-3.0.0-sysvinit, sysvinit
Children:
5a951e7
Parents:
e8f3474
git-author:
Chris Staub <chris@…> (05/18/14 20:23:56)
git-committer:
Chris Staub <chris@…> (05/18/14 20:25:27)
Message:

Replaced PKG_CONFIG vars with pkg-config-lite installed in /cross-tools

Conflicts:

BOOK/introduction/common/changelog.xml

Location:
BOOK/boot
Files:
11 edited

Legend:

Unmodified
Added
Removed

  • BOOK/boot/64/e2fsprogs.xml

    re8f3474 r9597c5a  
    3535    xpointer="xpointer(//*[@os='c'])"/>
    3636
    37 <screen os="aa"><userinput>CC="${CC} ${BUILD64}" PKG_CONFIG=true \
     37<screen os="aa"><userinput>CC="${CC} ${BUILD64}" \
    3838  ../configure --prefix=/tools --enable-elf-shlibs \
    3939    --build=${CLFS_HOST} --host=${CLFS_TARGET} \
    … …  
    4949    xpointer="xpointer(//*[@os='f'])"/>
    5050
    51 <screen os="g"><userinput>make LIBUUID="-luuid" STATIC_LIBUUID="-luuid" \
    52     LIBBLKID="-lblkid" STATIC_LIBBLKID="-lblkid" \
    53     LDFLAGS="-Wl,-rpath,/tools/lib"</userinput></screen>
     51    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     52    href="../common/e2fsprogs.xml"
     53    xpointer="xpointer(//*[@os='g'])"/>
    5454
    5555    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"

  • BOOK/boot/64/eudev.xml

    re8f3474 r9597c5a  
    2626    xpointer="xpointer(//*[@os='a'])"/>
    2727
    28 <screen os="b"><userinput>BLKID_CFLAGS="-I/tools/include" BLKID_LIBS="-L/tools/lib -lblkid" \
    29     KMOD_CFLAGS="-I/tools/include/" KMOD_LIBS="-L/tools/lib -lkmod" \
    30     CC="${CC} ${BUILD64}" ./configure --prefix=/tools --build=${CLFS_HOST} \
     28<screen os="b"><userinput>CC="${CC} ${BUILD64}" ./configure --prefix=/tools --build=${CLFS_HOST} \
    3129    --host=${CLFS_TARGET}  --disable-introspection --disable-gtk-doc-html \
    3230    --disable-gudev --disable-keymap --with-firmware-path=/tools/lib/firmware \

  • BOOK/boot/64/kmod.xml

    re8f3474 r9597c5a  
    3535    xpointer="xpointer(//*[@os='a'])"/>
    3636
    37 <screen os="b"><userinput>PKG_CONFIG= liblzma_CFLAGS="-I/tools/include" \
    38     liblzma_LIBS="-L/tools/lib -llzma" \
    39     zlib_CFLAGS="-I/tools/include" zlib_LIBS="-L/tools/lib -lz" \
    40     CC="${CC} ${BUILD64}" ./configure --prefix=/tools \
     37<screen os="b"><userinput>CC="${CC} ${BUILD64}" ./configure --prefix=/tools \
    4138    --build=${CLFS_HOST} --host=${CLFS_TARGET} --with-xz --with-zlib</userinput></screen>
    4239

  • BOOK/boot/common/e2fsprogs.xml

    re8f3474 r9597c5a  
    3535    xpointer="xpointer(//*[@os='c'])"/>
    3636
    37 <screen os="aa"><userinput>PKG_CONFIG=true \
    38   ../configure --prefix=/tools \
     37<screen os="aa"><userinput>../configure --prefix=/tools \
    3938    --enable-elf-shlibs --build=${CLFS_HOST} --host=${CLFS_TARGET} \
    4039    --disable-libblkid --disable-libuuid --disable-fsck \
    … …  
    5857    xpointer="xpointer(//*[@os='f'])"/>
    5958
    60 <screen os="g"><userinput>make LIBUUID="-luuid" STATIC_LIBUUID="-luuid" \
    61     LIBBLKID="-lblkid" STATIC_LIBBLKID="-lblkid"</userinput></screen>
     59    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     60    href="../../final-system/common/e2fsprogs.xml"
     61    xpointer="xpointer(//*[@os='g'])"/>
    6262
    6363    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"

  • BOOK/boot/common/eudev.xml

    re8f3474 r9597c5a  
    2828   <para os="a">Prepare Eudev for compilation:</para>
    2929
    30 <screen os="b"><userinput>BLKID_CFLAGS="-I/tools/include" BLKID_LIBS="-L/tools/lib -lblkid" \
    31     KMOD_CFLAGS="-I/tools/include/" KMOD_LIBS="-L/tools/lib -lkmod" \
    32     ./configure --prefix=/tools --build=${CLFS_HOST} --host=${CLFS_TARGET} \
     30<screen os="b"><userinput>./configure --prefix=/tools --build=${CLFS_HOST} --host=${CLFS_TARGET} \
    3331    --disable-introspection --disable-gtk-doc-html \
    3432    --disable-gudev --disable-keymap --with-firmware-path=/lib/firmware \

  • BOOK/boot/common/kmod.xml

    re8f3474 r9597c5a  
    3333    xpointer="xpointer(//*[@os='a'])"/>
    3434
    35 <screen os="b"><userinput>PKG_CONFIG= liblzma_CFLAGS="-I/tools/include" \
    36     liblzma_LIBS="-L/tools/lib -llzma" \
    37     zlib_CFLAGS="-I/tools/include" zlib_LIBS="-L/tools/lib -lz" \
    38     ./configure --prefix=/tools \
     35<screen os="b"><userinput>./configure --prefix=/tools \
    3936    --build=${CLFS_HOST} --host=${CLFS_TARGET} --with-xz --with-zlib</userinput></screen>
    4037

  • BOOK/boot/multilib/e2fsprogs.xml

    re8f3474 r9597c5a  
    4141    xpointer="xpointer(//*[@os='c'])"/>
    4242
    43 <screen os="aa"><userinput>CC="${CC} ${BUILD64}" PKG_CONFIG=true \
     43<screen os="aa"><userinput>CC="${CC} ${BUILD64}" \
    4444  ../configure --prefix=/tools --enable-elf-shlibs \
    4545    --build=${CLFS_HOST} --host=${CLFS_TARGET} \
    … …  
    5555    xpointer="xpointer(//*[@os='f'])"/>
    5656
    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>
     57    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     58    href="../common/e2fsprogs.xml"
     59    xpointer="xpointer(//*[@os='g'])"/>
    6060
    6161    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"

  • BOOK/boot/multilib/eudev.xml

    re8f3474 r9597c5a  
    2626    xpointer="xpointer(//*[@os='a'])"/>
    2727
    28 <screen os="b"><userinput>BLKID_CFLAGS="-I/tools/include" BLKID_LIBS="-L/tools/lib64 -lblkid" \
    29     KMOD_CFLAGS="-I/tools/include/" KMOD_LIBS="-L/tools/lib64 -lkmod" \
    30     CC="${CC} ${BUILD64}" ./configure --prefix=/tools --build=${CLFS_HOST} \
     28<screen os="b"><userinput>CC="${CC} ${BUILD64}" ./configure --prefix=/tools --build=${CLFS_HOST} \
    3129    --host=${CLFS_TARGET} --libdir=/tools/lib64 --with-rootlibdir=/tools/lib64 \
    3230    --disable-introspection --disable-gtk-doc-html --disable-gudev \

  • BOOK/boot/multilib/kmod.xml

    re8f3474 r9597c5a  
    3535    xpointer="xpointer(//*[@os='a'])"/>
    3636
    37 <screen os="b"><userinput>PKG_CONFIG= liblzma_CFLAGS="-I/tools/include" \
    38     liblzma_LIBS="-L/tools/lib64 -llzma" \
    39     zlib_CFLAGS="-I/tools/include" zlib_LIBS="-L/tools/lib64 -lz" \
    40     CC="${CC} ${BUILD64}" ./configure --prefix=/tools \
     37<screen os="b"><userinput>CC="${CC} ${BUILD64}" ./configure --prefix=/tools \
    4138    --build=${CLFS_HOST} --host=${CLFS_TARGET} \
    4239    --libdir=/tools/lib64 --with-xz --with-zlib</userinput></screen>

  • BOOK/boot/ppc64/e2fsprogs-libs.xml

    re8f3474 r9597c5a  
    4646    xpointer="xpointer(//*[@os='c'])"/>
    4747
    48 <screen os="aa"><userinput>CC="${CC} ${BUILD32}" PKG_CONFIG=true \
     48<screen os="aa"><userinput>CC="${CC} ${BUILD32}" \
    4949  ../configure --prefix=/tools --enable-elf-shlibs \
    5050    --build=${CLFS_HOST} --host=${CLFS_TARGET} \
    … …  
    6060    xpointer="xpointer(//*[@os='f'])"/>
    6161
    62 <screen os="g"><userinput>make LIBUUID="-luuid" STATIC_LIBUUID="-luuid" \
    63     LIBBLKID="-lblkid" STATIC_LIBBLKID="-lblkid" libs</userinput></screen>
     62    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     63    href="../common/e2fsprogs.xml"
     64    xpointer="xpointer(//*[@os='g'])"/>
    6465
    6566    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"

  • BOOK/boot/ppc64/e2fsprogs.xml

    re8f3474 r9597c5a  
    5454    xpointer="xpointer(//*[@os='c'])"/>
    5555
    56 <screen os="aa"><userinput>CC="${CC} ${BUILD64}" PKG_CONFIG=true \
     56<screen os="aa"><userinput>CC="${CC} ${BUILD64}" \
    5757  ../configure --prefix=/tools --enable-elf-shlibs \
    5858    --build=${CLFS_HOST} --host=${CLFS_TARGET} \
    … …  
    6868    xpointer="xpointer(//*[@os='f'])"/>
    6969
    70 <screen os="g"><userinput>make LIBUUID="-luuid" STATIC_LIBUUID="-luuid" \
    71     LIBBLKID="-lblkid" STATIC_LIBBLKID="-lblkid" libs
    72 make LIBUUID="-luuid" STATIC_LIBUUID="-luuid" LIBBLKID="-lblkid" \
    73     STATIC_LIBBLKID="-lblkid" LDFLAGS="-Wl,-rpath,/tools/lib64" -C e2fsck/</userinput></screen>
     70<screen os="g"><userinput>make libs
     71make -C e2fsck/</userinput></screen>
    7472
    7573    <para os="i">Install the e2fsck binary:</para>
Note: See TracChangeset for help on using the changeset viewer.