Ignore:
Timestamp:
Dec 18, 2013, 1:04:00 AM (11 years ago)
Author:
Chris Staub <chris@…>
Children:
f975b3a
Parents:
1c9985f (diff), 8abef998 (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:

Updated simp branch to match main book

Location:
BOOK/final-system/mips64
Files:
1 deleted
5 edited
1 moved

Legend:

Unmodified
Added
Removed

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

    r1c9985f r026bb5d  
    4242    xpointer="xpointer(//*[@os='f'])"/>
    4343
     44<!-- Branch update patch area
     45    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     46    href="../../final-system/common/binutils.xml"
     47    xpointer="xpointer(//*[@os='p1'])"/>
     48
     49    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     50    href="../../final-system/common/binutils.xml"
     51    xpointer="xpointer(//*[@os='p2'])"/>
     52-->
    4453    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
    4554    href="../common/binutils.xml"
    … …  
    5665<screen os="ca"><userinput>CC="gcc -isystem /usr/include ${BUILD64}" \
    5766LDFLAGS="-Wl,-rpath-link,/usr/lib64:/lib64:/usr/lib32:/lib32:/usr/lib:/lib ${BUILD64}" \
    58   ../binutils-&binutils-version;/configure --prefix=/usr \
     67  ../binutils-&binutils-dir;/configure --prefix=/usr \
    5968    --enable-shared --enable-64-bit-bfd --libdir=/usr/lib64</userinput></screen>
    6069

  • BOOK/final-system/mips64/eglibc-64bit.xml

    r1c9985f r026bb5d  
    3939
    4040    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
    41     href="../common/eglibc.xml"
    42     xpointer="xpointer(//*[@os='p1'])"/>
    43 
    44     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
    45     href="../common/eglibc.xml"
    46     xpointer="xpointer(//*[@os='p2'])"/>
    47 
    48     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
    4941    href="eglibc.xml"
    5042    xpointer="xpointer(//*[@os='b'])"/>
    51 
    52     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
    53     href="eglibc.xml"
    54     xpointer="xpointer(//*[@os='g1'])"/>
    55 
    56     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
    57     href="eglibc.xml"
    58     xpointer="xpointer(//*[@os='g2'])"/>
    5943
    6044    <para os="m3">The following will cause EGLIBC to use an absolute path to the
    … …  
    6347<screen os="m4"><userinput>cp -v config.make.in{,.orig}
    6448sed '/ldd-rewrite-script/s:@:${objdir}/&amp;:' config.make.in.orig &gt; config.make.in</userinput></screen>
     49
     50    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     51    href="../common/eglibc.xml"
     52    xpointer="xpointer(//*[@os='s1'])"/>
     53
     54    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     55    href="../common/eglibc.xml"
     56    xpointer="xpointer(//*[@os='s2'])"/>
    6557
    6658    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"

  • BOOK/final-system/mips64/eglibc-n32.xml

    r1c9985f r026bb5d  
    4040
    4141    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
    42     href="../common/eglibc.xml"
    43     xpointer="xpointer(//*[@os='p1'])"/>
    44 
    45     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
    46     href="../common/eglibc.xml"
    47     xpointer="xpointer(//*[@os='p2'])"/>
    48 
    49     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
    5042    href="eglibc.xml"
    5143    xpointer="xpointer(//*[@os='b'])"/>
    52 
    53     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
    54     href="eglibc.xml"
    55     xpointer="xpointer(//*[@os='g1'])"/>
    56 
    57     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
    58     href="eglibc.xml"
    59     xpointer="xpointer(//*[@os='g2'])"/>
    6044
    6145    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
    … …  
    6650    href="eglibc-64bit.xml"
    6751    xpointer="xpointer(//*[@os='m4'])"/>
     52
     53    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     54    href="../common/eglibc.xml"
     55    xpointer="xpointer(//*[@os='s1'])"/>
     56
     57    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     58    href="../common/eglibc.xml"
     59    xpointer="xpointer(//*[@os='s2'])"/>
    6860
    6961    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
    … …  
    8678<screen os="h"><userinput>CC="gcc ${BUILDN32}" CXX="g++ ${BUILDN32}" \
    8779    ../eglibc-&eglibc-version;/configure --prefix=/usr \
    88     --disable-profile --enable-add-ons --enable-kernel=2.6.0 \
    89     --libexecdir=/usr/lib32/eglibc --libdir=/usr/lib32</userinput></screen>
     80    --disable-profile --enable-kernel=2.6.32 \
     81    --libexecdir=/usr/lib32/eglibc --libdir=/usr/lib32 \
     82    --enable-obsolete-rpc</userinput></screen>
    9083
    9184    <variablelist os="i">
    … …  
    9588        <term><parameter>--libexecdir=/usr/lib32/eglibc</parameter></term>
    9689        <listitem>
    97           <para>This changes the location of the <command>pt_chown</command>
     90          <para>This changes the location of the <command>getconf</command>
    9891          program from its default of <filename
    9992          class="directory">/usr/libexec</filename> to <filename

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

    r1c9985f r026bb5d  
    4545    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
    4646    href="../common/eglibc.xml"
    47     xpointer="xpointer(//*[@os='p1'])"/>
     47    xpointer="xpointer(//*[@os='b'])"/>
    4848
    4949    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
    5050    href="../common/eglibc.xml"
    51     xpointer="xpointer(//*[@os='p2'])"/>
     51    xpointer="xpointer(//*[@os='s1'])"/>
    5252
    5353    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
    5454    href="../common/eglibc.xml"
    55     xpointer="xpointer(//*[@os='b'])"/>
    56 
    57     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
    58     href="../mips/eglibc.xml"
    59     xpointer="xpointer(//*[@os='g1'])"/>
    60 
    61     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
    62     href="../mips/eglibc.xml"
    63     xpointer="xpointer(//*[@os='g2'])"/>
     55    xpointer="xpointer(//*[@os='s2'])"/>
    6456
    6557    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
    … …  
    9789    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
    9890    href="../multilib/eglibc.xml"
    99     xpointer="xpointer(//*[@os='l1'])"/>
     91    xpointer="xpointer(//*[@os='l1b'])"/>
    10092
    10193    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
    10294    href="../multilib/eglibc.xml"
    103     xpointer="xpointer(//*[@os='l2'])"/>
     95    xpointer="xpointer(//*[@os='l2b'])"/>
    10496
    10597    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"

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

    r1c9985f r026bb5d  
    3232    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
    3333    href="../common/gcc.xml"
     34    xpointer="xpointer(//*[@os='fix1'])"/>
     35
     36    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     37    href="../common/gcc.xml"
     38    xpointer="xpointer(//*[@os='fix2'])"/>
     39
     40    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     41    href="../common/gcc.xml"
    3442    xpointer="xpointer(//*[@os='d'])"/>
    3543
    … …  
    5664    --libexecdir=/usr/lib64 --enable-shared --enable-threads=posix \
    5765    --enable-__cxa_atexit --enable-c99 --enable-long-long --with-abi=64 \
    58     --enable-clocale=gnu --enable-languages=c,c++ --disable-libstdcxx-pch</userinput></screen>
     66    --enable-clocale=gnu --enable-languages=c,c++ --disable-libstdcxx-pch \
     67    --enable-cloog-backend=isl --disable-isl-version-check --with-system-zlib \
     68    --enable-checking=release --enable-libstdcxx-time \
     69    --disable-install-libiberty</userinput></screen>
    5970
    6071    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
    … …  
    6980    href="../common/gcc.xml"
    7081    xpointer="xpointer(//*[@os='l'])"/>
     82
     83    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     84    href="../common/gcc.xml"
     85    xpointer="xpointer(//*[@os='s1'])"/>
     86
     87    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     88    href="../common/gcc.xml"
     89    xpointer="xpointer(//*[@os='s2'])"/>
    7190
    7291    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
    … …  
    118137    xpointer="xpointer(//*[@os='x'])"/>
    119138
     139    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     140    href="../multilib/gcc.xml"
     141    xpointer="xpointer(//*[@os='y'])"/>
     142
     143<screen os="z"><userinput>mv -v /usr/lib/*gdb.py /usr/share/gdb/auto-load/usr/lib
     144mv -v /usr/lib32/*gdb.py /usr/share/gdb/auto-load/usr/lib32
     145mv -v /usr/lib64/*gdb.py /usr/share/gdb/auto-load/usr/lib64</userinput></screen>
     146
    120147  </sect2>
    121148

  • BOOK/final-system/mips64/pkg-config-lite.xml

    r1c9985f r026bb5d  
    66]>
    77
    8 <sect1 id="ch-system-pkg-config" role="wrap">
    9   <?dbhtml filename="pkg-config.html"?>
     8<sect1 id="ch-system-pkg-config-lite" role="wrap">
     9  <?dbhtml filename="pkg-config-lite.html"?>
    1010
    11   <title>Pkg-config-&pkg-config-version;</title>
     11  <title>Pkg-config-lite-&pkg-config-lite-version;</title>
    1212
    13   <indexterm zone="ch-system-pkg-config">
    14     <primary sortas="a-Autoconf">Pkg-config</primary>
     13  <indexterm zone="ch-system-pkg-config-lite">
     14    <primary sortas="a-Pkg-config-lite">Pkg-config-lite</primary>
    1515  </indexterm>
    1616
    1717  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
    18   href="../common/pkg-config.xml"
     18  href="../common/pkg-config-lite.xml"
    1919  xpointer="xpointer(//*[@role='package'])"/>
    2020
    2121  <sect2 role="installation">
    22     <title>Installation of Pkg-config</title>
     22    <title>Installation of Pkg-config-lite</title>
    2323
    2424    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
    25     href="../common/pkg-config.xml"
     25    href="../common/pkg-config-lite.xml"
    2626    xpointer="xpointer(//*[@os='a'])"/>
    2727
    2828    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
    29     href="../multilib/pkg-config.xml"
     29    href="../multilib/pkg-config-lite.xml"
    3030    xpointer="xpointer(//*[@os='b'])"/>
    3131
    3232    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
    33     href="../common/pkg-config.xml"
     33    href="../common/pkg-config-lite.xml"
    3434    xpointer="xpointer(//*[@os='c'])"/>
    3535
    3636    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
    37     href="../common/pkg-config.xml"
     37    href="../common/pkg-config-lite.xml"
    3838    xpointer="xpointer(//*[@os='d'])"/>
    3939
    4040    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
    41     href="../common/pkg-config.xml"
     41    href="../common/pkg-config-lite.xml"
    4242    xpointer="xpointer(//*[@os='e'])"/>
    4343
    4444    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
    45     href="../common/pkg-config.xml"
     45    href="../common/pkg-config-lite.xml"
     46    xpointer="xpointer(//*[@os='e2'])"/>
     47
     48    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     49    href="../common/pkg-config-lite.xml"
    4650    xpointer="xpointer(//*[@os='f'])"/>
    4751
    4852    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
    49     href="../common/pkg-config.xml"
     53    href="../common/pkg-config-lite.xml"
    5054    xpointer="xpointer(//*[@os='g'])"/>
    5155
    5256    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
    53     href="../multilib/pkg-config.xml"
     57    href="../multilib/pkg-config-lite.xml"
    5458    xpointer="xpointer(//*[@os='m1'])"/>
    5559
    … …  
    5963
    6064    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
    61     href="../multilib/pkg-config.xml"
     65    href="../multilib/pkg-config-lite.xml"
    6266    xpointer="xpointer(//*[@os='m3'])"/>
    6367
    … …  
    7175
    7276  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
    73   href="../common/pkg-config.xml"
    74   xpointer="xpointer(id('contents-pkg-config'))"/>
     77  href="../common/pkg-config-lite.xml"
     78  xpointer="xpointer(id('contents-pkg-config-lite'))"/>
    7579
    7680</sect1>
Note: See TracChangeset for help on using the changeset viewer.