Changeset 27931b9


Ignore:
Timestamp:
Jan 30, 2011, 1:25:46 PM (14 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:
a4d251f, fd34dc3
Parents:
f586fdb
Message:

Remove the hackery from E2fsprogs that allows it to bypass pkg-config
and just rely on pkg-config now that we have it.

Location:
BOOK/final-system
Files:
4 edited

Legend:

Unmodified
Added
Removed

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

    rf586fdb r27931b9  
    3737    <para os="c">Prepare E2fsprogs for compilation:</para>
    3838
    39 <screen os="d"><userinput>PKG_CONFIG=true ../configure --prefix=/usr --with-root-prefix="" \
     39<screen os="d"><userinput>../configure --prefix=/usr --with-root-prefix="" \
    4040    --enable-elf-shlibs --disable-libblkid \
    4141    --disable-libuuid --disable-fsck \
    … …  
    7171    <para os="f">Compile the package:</para>
    7272
    73 <screen os="g"><userinput>make LIBUUID="-luuid" STATIC_LIBUUID="-luuid" \
    74     LIBBLKID="-lblkid" STATIC_LIBBLKID="-lblkid"</userinput></screen>
     73<screen os="g"><userinput>make</userinput></screen>
    7574
    7675    <para os="h">To test the results, issue:

  • BOOK/final-system/multilib/e2fsprogs-64bit.xml

    rf586fdb r27931b9  
    3939    xpointer="xpointer(//*[@os='c'])"/>
    4040
    41 <screen os="d"><userinput>CC="gcc ${BUILD64}" PKG_CONFIG=true \
    42     ../configure --prefix=/usr --with-root-prefix="" \
     41<screen os="d"><userinput>CC="gcc ${BUILD64}" PKG_CONFIG_PATH="${PKG_CONFIG_PATH64}" \
     42  ../configure --prefix=/usr --with-root-prefix="" \
    4343    --enable-elf-shlibs --disable-libblkid \
    4444    --disable-libuuid --disable-fsck \

  • BOOK/final-system/multilib/e2fsprogs-n32.xml

    rf586fdb r27931b9  
    4040    xpointer="xpointer(//*[@os='c'])"/>
    4141
    42 <screen os="d"><userinput>CC="gcc ${BUILDN32}" PKG_CONFIG=true \
    43     ../configure --prefix=/usr --with-root-prefix="" \
     42<screen os="d"><userinput>CC="gcc ${BUILDN32}" PKG_CONFIG_PATH="${PKG_CONFIG_PATHN32}" \
     43  ../configure --prefix=/usr --with-root-prefix="" \
    4444    --enable-elf-shlibs --disable-libblkid \
    4545    --disable-libuuid --disable-fsck \

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

    rf586fdb r27931b9  
    3535    xpointer="xpointer(//*[@os='c'])"/>
    3636
    37 <screen os="d"><userinput>CC="gcc ${BUILD32}" PKG_CONFIG=true \
    38     ../configure --prefix=/usr --with-root-prefix="" \
     37<screen os="d"><userinput>CC="gcc ${BUILD32}" PKG_CONFIG_PATH="${PKG_CONFIG_PATH32}" \
     38  ../configure --prefix=/usr --with-root-prefix="" \
    3939    --enable-elf-shlibs --disable-libblkid \
    4040    --disable-libuuid --disable-fsck \
Note: See TracChangeset for help on using the changeset viewer.