Ignore:
Timestamp:
Feb 26, 2012, 9:50:35 AM (13 years ago)
Author:
Jonathan Norman <jon@…>
Branches:
clfs-2.1, clfs-3.0.0-systemd, clfs-3.0.0-sysvinit, master, systemd, sysvinit
Children:
5b6948a
Parents:
0fadcfd (diff), 68fb4f2 (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 with Cosmo-branch, renamed / rediffed patches as required and fixed download links

Location:
BOOK/final-system/multilib
Files:
8 edited
3 moved

Legend:

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

    r0fadcfd r35e7499  
    5757LDFLAGS="-Wl,-rpath-link,/usr/lib64:/lib64:/usr/lib:/lib ${BUILD64}" \
    5858  ../binutils-&binutils-dir;/configure --prefix=/usr \
    59     --enable-shared --enable-64-bit-bfd --libdir=/usr/lib64</userinput></screen>
     59    --enable-shared --enable-64-bit-bfd --libdir=/usr/lib64 \
     60    --enable-cloog-backend=isl</userinput></screen>
    6061
    6162    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
  • BOOK/final-system/multilib/cloog-64bit.xml

    r0fadcfd r35e7499  
    66]>
    77
    8 <sect1 id="ch-system-cloog-ppl" role="wrap">
    9   <?dbhtml filename="cloog-ppl-64bit.html"?>
     8<sect1 id="ch-system-cloog" role="wrap">
     9  <?dbhtml filename="cloog-64bit.html"?>
    1010
    11   <title>CLooG-PPL-&cloog-ppl-version; 64 Bit</title>
     11  <title>CLooG-&cloog-version; 64 Bit</title>
    1212
    13   <indexterm zone="ch-system-cloog-ppl">
    14     <primary sortas="a-CLooG-PPL">CLooG-PPL</primary>
     13  <indexterm zone="ch-system-cloog">
     14    <primary sortas="a-CLooG">CLooG</primary>
    1515  </indexterm>
    1616
    1717  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
    18   href="../common/cloog-ppl.xml"
     18  href="../common/cloog.xml"
    1919  xpointer="xpointer(//*[@role='package'])"/>
    2020
    2121  <sect2 role="installation">
    22     <title>Installation of CLooG-PPL</title>
     22    <title>Installation of CLooG</title>
    2323
    2424    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
    25     href="../common/cloog-ppl.xml"
     25    href="../common/cloog.xml"
    2626    xpointer="xpointer(//*[@os='a'])"/>
    2727
     
    2929LDFLAGS="-Wl,-rpath-link,/usr/lib64:/lib64 ${BUILD64}" \
    3030  ./configure --prefix=/usr \
    31     --libdir=/usr/lib64 --enable-shared --with-gmp \
    32     --with-ppl</userinput></screen>
     31    --libdir=/usr/lib64 --enable-shared</userinput></screen>
    3332
    3433    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
    35     href="../common/cloog-ppl.xml"
     34    href="../common/cloog.xml"
    3635    xpointer="xpointer(//*[@os='c'])"/>
    3736
    3837    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
    39     href="../common/cloog-ppl.xml"
     38    href="../common/cloog.xml"
    4039    xpointer="xpointer(//*[@os='d'])"/>
    4140
    4241    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
    43     href="../common/cloog-ppl.xml"
     42    href="../common/cloog.xml"
    4443    xpointer="xpointer(//*[@os='e'])"/>
    4544
    4645    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
    47     href="../common/cloog-ppl.xml"
     46    href="../common/cloog.xml"
    4847    xpointer="xpointer(//*[@os='f'])"/>
    4948
    5049    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
    51     href="../common/cloog-ppl.xml"
     50    href="../common/cloog.xml"
    5251    xpointer="xpointer(//*[@os='g'])"/>
    5352
    5453    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
    55     href="../common/cloog-ppl.xml"
     54    href="../common/cloog.xml"
    5655    xpointer="xpointer(//*[@os='h'])"/>
    5756
    5857    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
    59     href="../common/cloog-ppl.xml"
     58    href="../common/cloog.xml"
    6059    xpointer="xpointer(//*[@os='i'])"/>
    6160
     
    6362
    6463  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
    65   href="../common/cloog-ppl.xml"
    66   xpointer="xpointer(id('contents-cloog-ppl'))"/>
     64  href="../common/cloog.xml"
     65  xpointer="xpointer(id('contents-cloog'))"/>
    6766
    6867</sect1>
  • BOOK/final-system/multilib/cloog-n32.xml

    r0fadcfd r35e7499  
    66]>
    77
    8 <sect1 id="ch-system-cloog-ppl-n32" role="wrap">
    9   <?dbhtml filename="cloog-ppl-n32.html"?>
     8<sect1 id="ch-system-cloog-n32" role="wrap">
     9  <?dbhtml filename="cloog-n32.html"?>
    1010
    11   <title>CLooG-PPL-&cloog-ppl-version; N32 Libraries</title>
     11  <title>CLooG-&cloog-version; N32 Libraries</title>
    1212
    13   <indexterm zone="ch-system-cloog-ppl-n32">
    14     <primary sortas="a-CLooG-PPL">CLooG-PPL</primary>
     13  <indexterm zone="ch-system-cloog-n32">
     14    <primary sortas="a-CLooG">CLooG</primary>
    1515    <secondary>N32</secondary>
    1616  </indexterm>
    1717
    1818  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
    19   href="../common/cloog-ppl.xml"
     19  href="../common/cloog.xml"
    2020  xpointer="xpointer(//*[@role='package'])"/>
    2121
    2222  <sect2 role="installation">
    23     <title>Installation of CLooG-PPL</title>
     23    <title>Installation of CLooG</title>
    2424
    2525    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
    26     href="../common/cloog-ppl.xml"
     26    href="../common/cloog.xml"
    2727    xpointer="xpointer(//*[@os='a'])"/>
    2828
     
    3030LDFLAGS="-Wl,-rpath-link,/usr/lib32:/lib32 ${BUILDN32}" \
    3131  ./configure --prefix=/usr \
    32     --libdir=/usr/lib32 --enable-shared --with-gmp \
    33     --with-ppl</userinput></screen>
     32    --libdir=/usr/lib32 --enable-shared</userinput></screen>
    3433
    3534    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
    36     href="../common/cloog-ppl.xml"
     35    href="../common/cloog.xml"
    3736    xpointer="xpointer(//*[@os='c'])"/>
    3837
    3938    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
    40     href="../common/cloog-ppl.xml"
     39    href="../common/cloog.xml"
    4140    xpointer="xpointer(//*[@os='d'])"/>
    4241
    4342    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
    44     href="../common/cloog-ppl.xml"
     43    href="../common/cloog.xml"
    4544    xpointer="xpointer(//*[@os='e'])"/>
    4645
    4746    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
    48     href="../common/cloog-ppl.xml"
     47    href="../common/cloog.xml"
    4948    xpointer="xpointer(//*[@os='f'])"/>
    5049
    5150    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
    52     href="../common/cloog-ppl.xml"
     51    href="../common/cloog.xml"
    5352    xpointer="xpointer(//*[@os='g'])"/>
    5453
    5554    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
    56     href="../common/cloog-ppl.xml"
     55    href="../common/cloog.xml"
    5756    xpointer="xpointer(//*[@os='h'])"/>
    5857
    5958    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
    60     href="../common/cloog-ppl.xml"
     59    href="../common/cloog.xml"
    6160    xpointer="xpointer(//*[@os='i'])"/>
    6261
     
    6766
    6867    <para>Details on this package are located in <xref
    69     linkend="contents-cloog-ppl" role="."/></para>
     68    linkend="contents-cloog" role="."/></para>
    7069
    7170  </sect2>
  • BOOK/final-system/multilib/cloog.xml

    r0fadcfd r35e7499  
    66]>
    77
    8 <sect1 id="ch-system-cloog-ppl-32" role="wrap">
    9   <?dbhtml filename="cloog-ppl.html"?>
     8<sect1 id="ch-system-cloog-32" role="wrap">
     9  <?dbhtml filename="cloog.html"?>
    1010
    11   <title>CLooG-PPL-&cloog-ppl-version; 32 Bit Libraries</title>
     11  <title>CLooG-&cloog-version; 32 Bit Libraries</title>
    1212
    13   <indexterm zone="ch-system-cloog-ppl-32">
    14     <primary sortas="a-CLooG-PPL">CLooG-PPL</primary>
     13  <indexterm zone="ch-system-cloog-32">
     14    <primary sortas="a-CLooG">CLooG</primary>
    1515    <secondary>32 Bit</secondary>
    1616  </indexterm>
    1717
    1818  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
    19   href="../common/cloog-ppl.xml"
     19  href="../common/cloog.xml"
    2020  xpointer="xpointer(//*[@role='package'])"/>
    2121
    2222  <sect2 role="installation">
    23     <title>Installation of CLooG-PPL</title>
     23    <title>Installation of CLooG</title>
    2424
    2525    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
    26     href="../common/cloog-ppl.xml"
     26    href="../common/cloog.xml"
    2727    xpointer="xpointer(//*[@os='a'])"/>
    2828
     
    3030LDFLAGS="-Wl,-rpath-link,/usr/lib:/lib ${BUILD32}" \
    3131  ./configure --prefix=/usr \
    32     --host=${CLFS_TARGET32} --enable-shared \
    33     --with-gmp --with-ppl</userinput></screen>
     32    --host=${CLFS_TARGET32} --enable-shared</userinput></screen>
    3433
    3534    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
    36     href="../common/cloog-ppl.xml"
     35    href="../common/cloog.xml"
    3736    xpointer="xpointer(//*[@os='c'])"/>
    3837
    3938    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
    40     href="../common/cloog-ppl.xml"
     39    href="../common/cloog.xml"
    4140    xpointer="xpointer(//*[@os='d'])"/>
    4241
    4342    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
    44     href="../common/cloog-ppl.xml"
     43    href="../common/cloog.xml"
    4544    xpointer="xpointer(//*[@os='e'])"/>
    4645
    4746    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
    48     href="../common/cloog-ppl.xml"
     47    href="../common/cloog.xml"
    4948    xpointer="xpointer(//*[@os='f'])"/>
    5049
    5150    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
    52     href="../common/cloog-ppl.xml"
     51    href="../common/cloog.xml"
    5352    xpointer="xpointer(//*[@os='g'])"/>
    5453
    5554    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
    56     href="../common/cloog-ppl.xml"
     55    href="../common/cloog.xml"
    5756    xpointer="xpointer(//*[@os='h'])"/>
    5857
    5958    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
    60     href="../common/cloog-ppl.xml"
     59    href="../common/cloog.xml"
    6160    xpointer="xpointer(//*[@os='i'])"/>
    6261
     
    6766
    6867    <para>Details on this package are located in <xref
    69     linkend="contents-cloog-ppl" role="."/></para>
     68    linkend="contents-cloog" role="."/></para>
    7069
    7170  </sect2>
  • BOOK/final-system/multilib/eglibc-64bit.xml

    r0fadcfd r35e7499  
    4646    href="../common/eglibc.xml"
    4747    xpointer="xpointer(//*[@os='p2'])"/>
     48   
     49    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     50    href="../common/eglibc.xml"
     51    xpointer="xpointer(//*[@os='p3'])"/>
     52
     53    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     54    href="../common/eglibc.xml"
     55    xpointer="xpointer(//*[@os='p4'])"/>
    4856
    4957    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
  • BOOK/final-system/multilib/eglibc.xml

    r0fadcfd r35e7499  
    5050    href="../common/eglibc.xml"
    5151    xpointer="xpointer(//*[@os='p2'])"/>
     52   
     53    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     54    href="../common/eglibc.xml"
     55    xpointer="xpointer(//*[@os='p3'])"/>
     56
     57    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     58    href="../common/eglibc.xml"
     59    xpointer="xpointer(//*[@os='p4'])"/>
    5260
    5361    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
  • BOOK/final-system/multilib/gcc.xml

    r0fadcfd r35e7499  
    2222    <title>Installation of GCC</title>
    2323
    24     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     24<!--    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
    2525    href="../common/gcc.xml"
    2626    xpointer="xpointer(//*[@os='p1'])"/>
     
    2828    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
    2929    href="../common/gcc.xml"
    30     xpointer="xpointer(//*[@os='p2'])"/>
     30    xpointer="xpointer(//*[@os='p2'])"/> -->
    3131
    3232    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     
    5656    --libexecdir=/usr/lib64 --enable-shared --enable-threads=posix \
    5757    --enable-__cxa_atexit --enable-c99 --enable-long-long \
    58     --enable-clocale=gnu --enable-languages=c,c++ --disable-libstdcxx-pch</userinput></screen>
     58    --enable-clocale=gnu --enable-languages=c,c++ --disable-libstdcxx-pch \
     59    --enable-cloog-backend=isl</userinput></screen>
    5960
    6061    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
  • BOOK/final-system/multilib/iproute2.xml

    r0fadcfd r35e7499  
    2929    href="../common/iproute2.xml"
    3030    xpointer="xpointer(//*[@os='s2'])"/>
     31   
     32    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     33    href="../common/iproute2.xml"
     34    xpointer="xpointer(//*[@os='f1'])"/>
     35   
     36    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     37    href="../common/iproute2.xml"
     38    xpointer="xpointer(//*[@os='f2'])"/>
    3139
    3240    <para os="p1">This patch adds the ability to update the LIBDIR path:</para>
  • BOOK/final-system/multilib/module-init-tools.xml

    r0fadcfd r35e7499  
    2121  <sect2 role="installation">
    2222    <title>Installation of Module-Init-Tools</title>
     23
     24    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     25    href="../common/module-init-tools.xml"
     26    xpointer="xpointer(//*[@os='p1'])"/>
     27
     28    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     29    href="../common/module-init-tools.xml"
     30    xpointer="xpointer(//*[@os='p2'])"/>
    2331
    2432    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
  • BOOK/final-system/multilib/patch.xml

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

    r0fadcfd r35e7499  
    3939
    4040<screen os="c"><userinput>CC="gcc ${BUILD64}" ./configure --sysconfdir=/etc \
    41    --without-libpam --without-audit --without-selinux</userinput></screen>
     41   --without-libpam --without-audit --without-selinux \
     42   --without-nscd</userinput></screen>
    4243
    4344    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
Note: See TracChangeset for help on using the changeset viewer.