Ignore:
Timestamp:
May 23, 2011, 3:04:49 PM (13 years ago)
Author:
Joe Ciccone <jciccone@…>
Branches:
clfs-3.0.0-systemd, clfs-3.0.0-sysvinit, master, systemd, sysvinit
Children:
cfb2026a
Parents:
30a199c (diff), 1ac2d0c (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

Conflicts:

BOOK/final-system/common/kbd.xml

Location:
BOOK/final-system/multilib
Files:
3 added
5 edited

Legend:

Unmodified
Added
Removed
  • BOOK/final-system/multilib/kbd.xml

    r30a199c r1718e20  
    2121  <sect2 role="installation">
    2222    <title>Installation of Kbd</title>
     23
     24    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     25    href="../common/kbd.xml"
     26    xpointer="xpointer(//*[@os='p1'])"/>
     27
     28    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     29    href="../common/kbd.xml"
     30    xpointer="xpointer(//*[@os='p2'])"/>
    2331
    2432    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
  • BOOK/final-system/multilib/pkg-config.xml

    r30a199c r1718e20  
    2626    xpointer="xpointer(//*[@os='a'])"/>
    2727
    28 <screen os="b"><userinput>CC="gcc ${BUILD64}" \
     28<screen os="b"><userinput>GLIB_CFLAGS="-I/usr/include/glib-2.0 -I/usr/lib64/glib-2.0/include" \
     29  GLIB_LIBS="-lglib-2.0" \
     30  CC="gcc ${BUILD64}" \
    2931  ./configure --prefix=/usr \
    3032    --with-pc-path=/usr/share/pkgconfig </userinput></screen>
     33
     34    <variablelist os="bb">
     35      <title>The meaning of the new configure option:</title>
     36
     37      <varlistentry>
     38        <term><parameter>GLIB_CFLAGS="-I/usr/include/glib-2.0 -I/usr/libi64/glib-2.0/include"</parameter></term>
     39        <term><parameter>GLIB_LIBS="-lglib-2.0"</parameter></term>
     40        <listitem>
     41          <para>Pkg-config no longer comes with Glib and because Pkg-config
     42        has not been installed itself it needs to be told where Glib is.</para>
     43        </listitem>
     44      </varlistentry>
     45    </variablelist>
     46
    3147
    3248    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
  • BOOK/final-system/multilib/xz-64bit.xml

    r30a199c r1718e20  
    5656    xpointer="xpointer(//*[@os='i'])"/>
    5757
    58 <screen os="j"><userinput>mv -v /lib64/liblzma.a /usr/lib64</userinput></screen>
     58    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     59    href="xz.xml"
     60    xpointer="xpointer(//*[@os='j'])"/>
     61
     62    <screen os="k"><userinput>mv -v /lib64/liblzma.a /usr/lib64</userinput></screen>
    5963
    6064  </sect2>
  • BOOK/final-system/multilib/xz-n32.xml

    r30a199c r1718e20  
    5757    xpointer="xpointer(//*[@os='i'])"/>
    5858
    59 <screen os="j"><userinput>mv -v /lib32/liblzma.a /usr/lib32</userinput></screen>
     59    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     60    href="xz.xml"
     61    xpointer="xpointer(//*[@os='j'])"/>
     62
     63<screen os="k"><userinput>mv -v /lib32/liblzma.a /usr/lib32</userinput></screen>
    6064
    6165  </sect2>
  • BOOK/final-system/multilib/xz.xml

    r30a199c r1718e20  
    5757    xpointer="xpointer(//*[@os='i'])"/>
    5858
    59     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
    60     href="../common/xz.xml"
    61     xpointer="xpointer(//*[@os='j'])"/>
     59    <para os="j">Move the static libraries to the proper location:</para>
     60
     61    <screen os="k"><userinput>mv -v /lib/liblzma.a /usr/lib</userinput></screen>
    6262
    6363  </sect2>
Note: See TracChangeset for help on using the changeset viewer.