Changeset 6cefbfb for BOOK/final-system


Ignore:
Timestamp:
Apr 16, 2011, 2:36:23 PM (14 years ago)
Author:
Joe Ciccone <jciccone@…>
Branches:
clfs-3.0.0-systemd, clfs-3.0.0-sysvinit, master, systemd, sysvinit
Children:
21e442f
Parents:
8c3f58f (diff), af891d2 (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/introduction/common/changelog.xml
BOOK/packages.ent

Location:
BOOK/final-system
Files:
13 edited

Legend:

Unmodified
Added
Removed

  • BOOK/final-system/common/cloog-ppl.xml

    r8c3f58f r6cefbfb  
    2727  <sect2 role="installation">
    2828    <title>Installation of CLooG-PPL</title>
    29 
    30     <para os="p1">When this version of CLooG-PPL was packaged it was missing
    31     a few files related to Libtool. The following patch adds them back in and
    32     regenerted Automake and Autoconf.</para>
    33 
    34 <screen os="p2"><userinput>patch -Np1 -i ../&cloog-ppl-autogen-patch;</userinput></screen>
    3529
    3630    <para os="a">Prepare CLooG-PPL for compilation:</para>

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

    r8c3f58f r6cefbfb  
    2929
    3030<screen os="b"><userinput>CC="gcc -isystem /usr/include" \
    31 LDFLAGS="-Wl,-rpath-link,/lib" \
     31LDFLAGS="-Wl,-rpath-link,/lib" EGREP="grep -E" \
    3232./configure --prefix=/usr</userinput></screen>
    3333

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

    r8c3f58f r6cefbfb  
    2626  <sect2 role="installation">
    2727    <title>Installation of PPL</title>
    28 
    29     <para os="s1">The following fixes an issue when detecting newer versions
    30     of GMP.</para>
    31 
    32 <screen os="s2"><userinput>sed -i "s/__GMP_BITS_PER_MP_LIMB/GMP_LIMB_BITS/g" configure</userinput></screen>
    3328
    3429    <para os="a">Prepare PPL for compilation:</para>

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

    r8c3f58f r6cefbfb  
    2121  <sect2 role="installation">
    2222    <title>Installation of PPL</title>
    23 
    24     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
    25     href="../common/ppl.xml"
    26     xpointer="xpointer(//*[@os='s1'])"/>
    27 
    28     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
    29     href="../common/ppl.xml"
    30     xpointer="xpointer(//*[@os='s2'])"/>
    3123
    3224    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"

  • BOOK/final-system/multilib/cloog-ppl-64bit.xml

    r8c3f58f r6cefbfb  
    2121  <sect2 role="installation">
    2222    <title>Installation of CLooG-PPL</title>
    23 
    24     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
    25     href="../common/cloog-ppl.xml"
    26     xpointer="xpointer(//*[@os='p1'])"/>
    27 
    28     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
    29     href="../common/cloog-ppl.xml"
    30     xpointer="xpointer(//*[@os='p2'])"/>
    3123
    3224    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"

  • BOOK/final-system/multilib/cloog-ppl-n32.xml

    r8c3f58f r6cefbfb  
    2222  <sect2 role="installation">
    2323    <title>Installation of CLooG-PPL</title>
    24 
    25     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
    26     href="../common/cloog-ppl.xml"
    27     xpointer="xpointer(//*[@os='p1'])"/>
    28 
    29     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
    30     href="../common/cloog-ppl.xml"
    31     xpointer="xpointer(//*[@os='p2'])"/>
    3224
    3325    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"

  • BOOK/final-system/multilib/cloog-ppl.xml

    r8c3f58f r6cefbfb  
    2222  <sect2 role="installation">
    2323    <title>Installation of CLooG-PPL</title>
    24 
    25     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
    26     href="../common/cloog-ppl.xml"
    27     xpointer="xpointer(//*[@os='p1'])"/>
    28 
    29     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
    30     href="../common/cloog-ppl.xml"
    31     xpointer="xpointer(//*[@os='p2'])"/>
    3224
    3325    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"

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

    r8c3f58f r6cefbfb  
    2727
    2828<screen os="b"><userinput>CC="gcc -isystem /usr/include ${BUILD64}" \
    29 LDFLAGS="-Wl,-rpath-link,/lib64 ${BUILD64}" \
     29LDFLAGS="-Wl,-rpath-link,/lib64 ${BUILD64}" EGREP="grep -E" \
    3030./configure --prefix=/usr --libdir=/usr/lib64</userinput></screen>
    3131

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

    r8c3f58f r6cefbfb  
    2828
    2929<screen os="b"><userinput>CC="gcc -isystem /usr/include ${BUILDN32}" \
    30 LDFLAGS="-Wl,-rpath-link,/lib32 ${BUILDN32}" \
     30LDFLAGS="-Wl,-rpath-link,/lib32 ${BUILDN32}" EGREP="grep -E" \
    3131./configure --prefix=/usr --libdir=/usr/lib32</userinput></screen>
    3232

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

    r8c3f58f r6cefbfb  
    2828
    2929<screen os="b"><userinput>CC="gcc -isystem /usr/include ${BUILD32}" \
    30 LDFLAGS="-Wl,-rpath-link,/lib ${BUILD32}" \
    31 ./configure --prefix=/usr \
    32     --host=${CLFS_TARGET32}</userinput></screen>
     30LDFLAGS="-Wl,-rpath-link,/lib ${BUILD32}" EGREP="grep -E" \
     31./configure --prefix=/usr --host=${CLFS_TARGET32}</userinput></screen>
    3332
    3433    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"

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

    r8c3f58f r6cefbfb  
    2121  <sect2 role="installation">
    2222    <title>Installation of PPL</title>
    23 
    24     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
    25     href="../common/ppl.xml"
    26     xpointer="xpointer(//*[@os='s1'])"/>
    27 
    28     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
    29     href="../common/ppl.xml"
    30     xpointer="xpointer(//*[@os='s2'])"/>
    3123
    3224    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"

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

    r8c3f58f r6cefbfb  
    2222  <sect2 role="installation">
    2323    <title>Installation of PPL</title>
    24 
    25     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
    26     href="../common/ppl.xml"
    27     xpointer="xpointer(//*[@os='s1'])"/>
    28 
    29     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
    30     href="../common/ppl.xml"
    31     xpointer="xpointer(//*[@os='s2'])"/>
    3224
    3325    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"

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

    r8c3f58f r6cefbfb  
    2222  <sect2 role="installation">
    2323    <title>Installation of PPL</title>
    24 
    25     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
    26     href="../common/ppl.xml"
    27     xpointer="xpointer(//*[@os='s1'])"/>
    28 
    29     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
    30     href="../common/ppl.xml"
    31         xpointer="xpointer(//*[@os='s2'])"/>
    3224
    3325    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
Note: See TracChangeset for help on using the changeset viewer.