Changeset a4d251f


Ignore:
Timestamp:
Jan 30, 2011, 1:26:37 PM (14 years ago)
Author:
Joe Ciccone <jciccone@…>
Branches:
clfs-3.0.0-systemd, clfs-3.0.0-sysvinit, master, systemd, sysvinit
Children:
fff5cb5
Parents:
2572b8e (diff), 27931b9 (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' into systemd

Location:
BOOK
Files:
3 added
20 edited

Legend:

Unmodified
Added
Removed

  • BOOK/appendices/dependencies/common.xml

    r2572b8e ra4d251f  
    400400        <seglistitem>
    401401         <seg>Bash, Binutils, Coreutils, EGLIBC, Gawk, GCC, Gettext, Grep, Gzip,
    402          Make, Sed, Texinfo and Util-linux</seg>
     402         Make, Pkg-config, Sed, Texinfo and Util-linux</seg>
    403403        </seglistitem>
    404404      </segmentedlist>
    … …  
    11981198      </segmentedlist>
    11991199
     1200<!-- Begin Pkg-config dependency info -->
     1201  <bridgehead renderas="sect2" id="pkg-config-dep">Pkg-config</bridgehead>
     1202
     1203      <segmentedlist>
     1204        <segtitle>&dependencies;</segtitle>
     1205
     1206        <seglistitem>
     1207         <seg>Bash, Binutils, Coreutils, Diffutils, EGLIBC, Gawk, GCC, Grep,
     1208         Make and Sed</seg>
     1209        </seglistitem>
     1210      </segmentedlist>
     1211
     1212      <segmentedlist>
     1213        <segtitle>&testsuites;</segtitle>
     1214
     1215        <seglistitem>
     1216          <seg>None</seg>
     1217        </seglistitem>
     1218      </segmentedlist>
     1219
     1220      <segmentedlist>
     1221        <segtitle>&before;</segtitle>
     1222
     1223        <seglistitem>
     1224          <seg>Util-linux, E2fsprogs</seg>
     1225        </seglistitem>
     1226      </segmentedlist>
     1227
    12001228<!-- Begin Procps dependency info -->
    12011229  <bridgehead renderas="sect2" id="procps-dep">Procps</bridgehead>
    … …  
    15121540        <seglistitem>
    15131541         <seg>Bash, Binutils, Coreutils, EGLIBC, GCC, Grep,
    1514          Make, Ncurses, Sed, Texinfo and Zlib</seg>
     1542         Make, Ncurses, Pkg-config, Sed, Texinfo and Zlib</seg>
    15151543        </seglistitem>
    15161544      </segmentedlist>

  • BOOK/final-system/alpha-chapter.xml

    r2572b8e ra4d251f  
    3030  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/sed.xml"/>
    3131  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/ncurses.xml"/>
     32  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/pkg-config.xml"/>
    3233  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/util-linux.xml"/>
    3334  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/e2fsprogs.xml"/>

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

    r2572b8e ra4d251f  
    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/mips-chapter.xml

    r2572b8e ra4d251f  
    3030  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/sed.xml"/>
    3131  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/ncurses.xml"/>
     32  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/pkg-config.xml"/>
    3233  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/util-linux.xml"/>
    3334  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/e2fsprogs.xml"/>

  • BOOK/final-system/mips64-64-chapter.xml

    r2572b8e ra4d251f  
    3030  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/sed.xml"/>
    3131  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/ncurses.xml"/>
     32  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/pkg-config.xml"/>
    3233  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/util-linux.xml"/>
    3334  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/e2fsprogs.xml"/>

  • BOOK/final-system/mips64-chapter.xml

    r2572b8e ra4d251f  
    4545  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="multilib/ncurses-n32.xml"/>
    4646  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="multilib/ncurses-64bit.xml"/>
     47  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="mips64/pkg-config.xml"/>
    4748  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="multilib/util-linux.xml"/>
    4849  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="multilib/util-linux-n32.xml"/>

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

    r2572b8e ra4d251f  
    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

    r2572b8e ra4d251f  
    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

    r2572b8e ra4d251f  
    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 \

  • BOOK/final-system/ppc-chapter.xml

    r2572b8e ra4d251f  
    3030  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/sed.xml"/>
    3131  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/ncurses.xml"/>
     32  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/pkg-config.xml"/>
    3233  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/util-linux.xml"/>
    3334  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/e2fsprogs.xml"/>

  • BOOK/final-system/ppc64-chapter.xml

    r2572b8e ra4d251f  
    3939  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="multilib/ncurses.xml"/>
    4040  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="multilib/ncurses-64bit.xml"/>
     41  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="multilib/pkg-config.xml"/>
    4142  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="multilib/util-linux.xml"/>
    4243  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="multilib/util-linux-64bit.xml"/>

  • BOOK/final-system/sparc-chapter.xml

    r2572b8e ra4d251f  
    3030  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/sed.xml"/>
    3131  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/ncurses.xml"/>
     32  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/pkg-config.xml"/>
    3233  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/util-linux.xml"/>
    3334  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/e2fsprogs.xml"/>

  • BOOK/final-system/sparc64-64-chapter.xml

    r2572b8e ra4d251f  
    3030  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/sed.xml"/>
    3131  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/ncurses.xml"/>
     32  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/pkg-config.xml"/>
    3233  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/util-linux.xml"/>
    3334  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/e2fsprogs.xml"/>

  • BOOK/final-system/sparc64-chapter.xml

    r2572b8e ra4d251f  
    3939  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="multilib/ncurses.xml"/>
    4040  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="multilib/ncurses-64bit.xml"/>
     41  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="multilib/pkg-config.xml"/>
    4142  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="multilib/util-linux.xml"/>
    4243  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="multilib/util-linux-64bit.xml"/>

  • BOOK/final-system/x86-chapter.xml

    r2572b8e ra4d251f  
    3030  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/sed.xml"/>
    3131  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/ncurses.xml"/>
     32  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/pkg-config.xml"/>
    3233  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/util-linux.xml"/>
    3334  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/e2fsprogs.xml"/>

  • BOOK/final-system/x86_64-64-chapter.xml

    r2572b8e ra4d251f  
    3030  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/sed.xml"/>
    3131  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/ncurses.xml"/>
     32  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/pkg-config.xml"/>
    3233  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/util-linux.xml"/>
    3334  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/e2fsprogs.xml"/>

  • BOOK/final-system/x86_64-chapter.xml

    r2572b8e ra4d251f  
    3939  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="multilib/ncurses.xml"/>
    4040  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="multilib/ncurses-64bit.xml"/>
     41  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="multilib/pkg-config.xml"/>
    4142  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="multilib/util-linux.xml"/>
    4243  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="multilib/util-linux-64bit.xml"/>

  • BOOK/introduction/common/changelog.xml

    r2572b8e ra4d251f  
    4040      <para>January 30, 2011</para>
    4141      <itemizedlist>
     42        <listitem>
     43          <para>[jciccone] - Add Pkg-config 0.25.</para>
     44        </listitem>
    4245        <listitem>
    4346          <para>[jciccone] - Patch procps so that ps supports process control

  • BOOK/materials/common/packages.xml

    r2572b8e ra4d251f  
    403403
    404404    <varlistentry>
     405      <term>Pkg-config (&pkg-config-version;) - <token>&pkg-config-size;</token>:</term>
     406      <listitem>
     407        <para>Home page: <ulink url="&pkg-config-home;"/></para>
     408        <para>Download: <ulink url="&pkg-config-url;"/></para>
     409        <para>MD5 sum: <literal>&pkg-config-md5;</literal></para>
     410      </listitem>
     411    </varlistentry>
     412
     413    <varlistentry>
    405414      <term>PPL (&ppl-version;) - <token>&ppl-size;</token>:</term>
    406415      <listitem>

  • BOOK/packages.ent

    r2572b8e ra4d251f  
    322322<!ENTITY perl-home "http://www.perl.org">
    323323
     324<!ENTITY pkg-config-version "0.25">
     325<!ENTITY pkg-config-size "968 KB">
     326<!ENTITY pkg-config-url "http://pkgconfig.freedesktop.org/releases/pkg-config-&pkg-config-version;.tar.gz">
     327<!ENTITY pkg-config-md5 "a3270bab3f4b69b7dc6dbdacbcae9745">
     328<!ENTITY pkg-config-home "http://pkgconfig.freedesktop.org/wiki/">
     329
    324330<!ENTITY powerpcutils-version "1.1.3">
    325331<!ENTITY powerpcutils-size "24 KB">
Note: See TracChangeset for help on using the changeset viewer.