Ignore:
Timestamp:
Apr 28, 2014, 8:56:46 PM (11 years ago)
Author:
Chris Staub <chris@…>
Parents:
5c8e74d (diff), 31cfd067 (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:

Merged latest systemd branch changes

Location:
BOOK/final-system/multilib
Files:
14 edited

Legend:

Unmodified
Added
Removed

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

    r5c8e74d r350ab24  
    4141  href="../common/acl.xml"
    4242  xpointer="xpointer(//*[@os='e'])"/>
    43  
     43
    4444<screen os="f"><userinput>CC="gcc ${BUILD64}" ./configure \
    4545    --prefix=/usr --libdir=/lib64 \

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

    r5c8e74d r350ab24  
    5454    href="../common/acl.xml"
    5555    xpointer="xpointer(//*[@os='h'])"/>
    56  
     56
    5757 <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
    5858    href="../common/acl.xml"

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

    r5c8e74d r350ab24  
    3838    --enable-no-install-program=kill,uptime \
    3939    --enable-install-program=hostname</userinput></screen>
    40    
     40
    4141    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
    4242    href="../common/coreutils.xml"

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

    r5c8e74d r350ab24  
    6666    href="../common/findutils.xml"
    6767    xpointer="xpointer(//*[@os='h'])"/>
    68 
    69     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
    70     href="../common/findutils.xml"
    71     xpointer="xpointer(//*[@os='i'])"/>
    72 
    73     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
    74     href="../common/findutils.xml"
    75     xpointer="xpointer(//*[@os='j'])"/>
    76 
    77     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
    78     href="../common/findutils.xml"
    79     xpointer="xpointer(//*[@os='k'])"/>
    80 
    81     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
    82     href="../common/findutils.xml"
    83     xpointer="xpointer(//*[@os='l'])"/>
    8468
    8569  </sect2>

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

    r5c8e74d r350ab24  
    2929    href="../common/iproute2.xml"
    3030    xpointer="xpointer(//*[@os='s2'])"/>
    31    
     31
    3232    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
    3333    href="../common/iproute2.xml"
    3434    xpointer="xpointer(//*[@os='f1'])"/>
    35    
     35
    3636    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
    3737    href="../common/iproute2.xml"

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

    r5c8e74d r350ab24  
    5959    href="../common/kmod.xml"
    6060    xpointer="xpointer(//*[@os='h'])"/>
    61    
     61
    6262    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
    6363    href="../common/kmod.xml"
    6464    xpointer="xpointer(//*[@os='i'])"/>
    65    
     65
    6666    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
    6767    href="../common/kmod.xml"

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

    r5c8e74d r350ab24  
    6060    href="../common/kmod.xml"
    6161    xpointer="xpointer(//*[@os='h'])"/>
    62    
     62
    6363  </sect2>
    6464

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

    r5c8e74d r350ab24  
    6262
    6363  </sect2>
    64  
     64
    6565  <sect2 role="content">
    6666    <title/>

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

    r5c8e74d r350ab24  
    3131       cpan/Compress-Raw-Zlib/config.in</userinput></screen>
    3232
    33     <para os="mp1">Perl does not, by default, know about library directories with names other
    34     than lib, The following patch will allow it to install to other directories:</para>
     33    <para os="mp1">Perl does not, by default, know about library directories
     34    with names other than <filename class="directory">lib</filename>. The
     35    following patch will allow it to install to other directories:</para>
    3536
    3637<screen os="mp2"><userinput>patch -Np1 -i ../&perl-multilib-patch;</userinput></screen>
    3738
    38     <para os="s1">There is a further (possibly cosmetic) anomaly - if we install perl and
    39     then run <command>perl -V</command> it will claim that libc is in /lib.  The
    40     following sed fixes this, but only takes effect when <command>make install
    41     </command> is run:</para>
     39    <para os="s1">There is a further (possibly cosmetic) anomaly - if we
     40    install Perl and then run <command>perl -V</command> it will claim that
     41    libc is in <filename class="directory">/lib</filename>.  The
     42    following sed fixes this, but only takes effect when
     43    <command>make install</command> is run:</para>
    4244
    4345<screen os="s2"><userinput>sed -i "/libc/s@/lib@/lib64@" hints/linux.sh</userinput></screen>
    4446
    45     <para os="m2">We still need to tell perl to actually use lib64:</para>
     47    <para os="m2">We still need to tell Perl to actually use <filename class="directory">lib64</filename>:</para>
    4648
    4749<screen os="m3"><userinput>echo 'installstyle="lib64/perl5"' >>hints/linux.sh</userinput></screen>

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

    r5c8e74d r350ab24  
    2626    xpointer="xpointer(//*[@os='a'])"/>
    2727
    28 <screen os="b"><userinput>CC="gcc ${BUILD64}" ./configure --prefix=/usr \
    29    --exec-prefix=""</userinput></screen>
     28<screen os="b"><userinput>CC="gcc ${BUILD64}" ./configure --prefix=/usr</userinput></screen>
    3029
    3130    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
    … …  
    4948    xpointer="xpointer(//*[@os='g'])"/>
    5049
    51     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
    52     href="../common/psmisc.xml"
    53     xpointer="xpointer(//*[@os='h'])"/>
    54 
    55     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
    56     href="../common/psmisc.xml"
    57     xpointer="xpointer(//*[@os='i'])"/>
    58 
    59     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
    60     href="../common/psmisc.xml"
    61     xpointer="xpointer(//*[@os='j'])"/>
    62 
    6350  </sect2>
    6451

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

    r5c8e74d r350ab24  
    3535
    3636<screen os="b"><userinput>CC="gcc ${BUILD64}" CXX="g++ ${BUILD64}" \
    37    ./configure --prefix=/usr --libdir=/lib64</userinput></screen>
     37   ./configure --prefix=/usr --libdir=/lib64 \
     38    --docdir=/usr/share/doc/readline-&readline-version;</userinput></screen>
    3839
    3940    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"

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

    r5c8e74d r350ab24  
    3636
    3737<screen os="b"><userinput>CC="gcc ${BUILDN32}" CXX="g++ ${BUILDN32}" \
    38    ./configure --prefix=/usr --libdir=/lib32</userinput></screen>
     38   ./configure --prefix=/usr --libdir=/lib32 \
     39    --docdir=/usr/share/doc/readline-&readline-version;</userinput></screen>
    3940
    4041    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"

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

    r5c8e74d r350ab24  
    3636
    3737<screen os="b"><userinput>CC="gcc ${BUILD32}" CXX="g++ ${BUILD32}" \
    38    ./configure --prefix=/usr --libdir=/lib</userinput></screen>
     38   ./configure --prefix=/usr --libdir=/lib \
     39    --docdir=/usr/share/doc/readline-&readline-version;</userinput></screen>
    3940
    4041    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"

  • BOOK/final-system/multilib/temp-perl.xml

    r5c8e74d r350ab24  
    6969    xpointer="xpointer(//*[@os='j'])"/>
    7070
     71    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     72    href="../common/temp-perl.xml"
     73    xpointer="xpointer(//*[@os='k'])"/>
     74
     75    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     76    href="../common/temp-perl.xml"
     77    xpointer="xpointer(//*[@os='l'])"/>
     78
    7179  </sect2>
    7280
Note: See TracChangeset for help on using the changeset viewer.