Changeset b88be39 for general


Ignore:
Timestamp:
10/31/2011 07:38:44 PM (13 years ago)
Author:
Bruce Dubbs <bdubbs@…>
Branches:
10.0, 10.1, 11.0, 11.1, 11.2, 11.3, 12.0, 12.1, 7.10, 7.4, 7.5, 7.6, 7.6-blfs, 7.6-systemd, 7.7, 7.8, 7.9, 8.0, 8.1, 8.2, 8.3, 8.4, 9.0, 9.1, basic, bdubbs/svn, elogind, gnome, kde5-13430, kde5-14269, kde5-14686, kea, ken/TL2024, ken/inkscape-core-mods, ken/tuningfonts, krejzi/svn, lazarus, lxqt, nosym, perl-modules, plabs/newcss, plabs/python-mods, python3.11, qt5new, rahul/power-profiles-daemon, renodr/vulkan-addition, systemd-11177, systemd-13485, trunk, upgradedb, xry111/intltool, xry111/llvm18, xry111/soup3, xry111/test-20220226, xry111/xf86-video-removal
Children:
afc3f45
Parents:
1365d551
Message:

Update to cmake-2.8.6.
Update to curl-7.22.0.
Updated to libarchive-2.8.5.
Reset all python references to python2.

git-svn-id: svn://svn.linuxfromscratch.org/BLFS/trunk/BOOK@8928 af4574ff-66df-0310-9fd7-8a98e5e911e0

Location:
general
Files:
8 edited

Legend:

Unmodified
Added
Removed

  • general/genlib/dbus-bindings.xml

    r1365d551 rb88be39  
    325325          <seg><application>Python</application>
    326326          <application>D-Bus</application> modules</seg>
    327           <seg>/usr/lib/python&python-majorver;/site-packages/dbus and
     327          <seg>/usr/lib/python&python2-majorver;/site-packages/dbus and
    328328          /usr/share/doc/dbus-python-&dbus-python-version;</seg>
    329329        </seglistitem>

  • general/genlib/expat.xml

    r1365d551 rb88be39  
    3333    C library for parsing XML.</para>
    3434
    35     &lfs67_checked;
     35    &lfs70_checked;
    3636
    3737    <bridgehead renderas="sect3">Package Information</bridgehead>

  • general/genlib/libgsf.xml

    r1365d551 rb88be39  
    139139        <seg>libgsf-1.{so,a} and optionally, libgsf-gnome-1.{so,a}</seg>
    140140        <seg>/usr/include/libgsf-1 and /usr/share/gtk-doc/html/gsf and
    141         optionally, /usr/lib/python&python-majorver;/site-packages/gsf</seg>
     141        optionally, /usr/lib/python&python2-majorver;/site-packages/gsf</seg>
    142142      </seglistitem>
    143143    </segmentedlist>

  • general/prog/python-modules.xml

    r1365d551 rb88be39  
    214214          <seg>xmlproc_parse and xmlproc_val</seg>
    215215          <seg>PyXML Python library modules</seg>
    216           <seg>/usr/lib/python&python-majorver;/site-packages/_xmlplus and
     216          <seg>/usr/lib/python&python2-majorver;/site-packages/_xmlplus and
    217217          /usr/share/doc/PyXML-&pyxml-version;</seg>
    218218        </seglistitem>
    … …  
    328328          <seg>Pycairo Python library module</seg>
    329329          <seg>/usr/include/pycairo and
    330           /usr/lib/python&python-majorver;/site-packages/cairo</seg>
     330          /usr/lib/python&python2-majorver;/site-packages/cairo</seg>
    331331        </seglistitem>
    332332      </segmentedlist>
    … …  
    429429          _gobject.so</seg>
    430430          <seg>/usr/{include/pygtk-2.0,
    431           lib/python&python-majorver;/site-packages/gtk-2.0/{gio,glib,gobject},
     431          lib/python&python2-majorver;/site-packages/gtk-2.0/{gio,glib,gobject},
    432432          share/{gtk-doc/html/pygobject,pygobject/{2.0/{codegen,defs},
    433433          xsl}}}</seg>
    … …  
    554554          pangocairo.so</seg>
    555555          <seg>/usr/{include/pygtk-2.0/pygtk,lib/{pygtk/2.0/demos/images,
    556           python&python-majorver;/site-packages/gtk-2.0/gtk},
     556          python&python2-majorver;/site-packages/gtk-2.0/gtk},
    557557          share/{gtk-doc/html/pygtk/{cursors,icons,images},pygtk/2.0/defs}}</seg>
    558558        </seglistitem>
    … …  
    895895          gnomevfsbonobo.so</seg>
    896896          <seg>/usr/{include/gnome-python-2.0,
    897           lib/python&python-majorver;/site-packages/gtk-2.0/{bonobo,gnomevfs},
     897          lib/python&python2-majorver;/site-packages/gtk-2.0/{bonobo,gnomevfs},
    898898          share/{gtk-doc/html/pygnomevfs,pygtk/2.0/argtypes}}</seg>
    899899        </seglistitem>
    … …  
    10431043          gnomeapplet.so, _gnomedesktop.so, gnomekeyring.so, _print.so, ui.so,
    10441044          gtop.so, mediaprofiles.so, rsvg.so, plparser.so, and wnck.so</seg>
    1045           <seg>/usr/{lib/python&python-majorver;/site-packages/gtk-2.0/{evolution,
     1045          <seg>/usr/{lib/python&python2-majorver;/site-packages/gtk-2.0/{evolution,
    10461046          gnomedesktop,gnomeprint,totem},share/gtk-doc/html/pygnomeprintui}</seg>
    10471047          <seg>None</seg>

  • general/prog/python.xml

    r1365d551 rb88be39  
    55  %general-entities;
    66
    7   <!ENTITY python-download-http "http://www.python.org/ftp/python/&python-version;/Python-&python-version;.tar.xz">
    8   <!ENTITY python-download-ftp  "&gentoo-ftp-repo;/Python-&python-version;.tar.xz">
    9   <!ENTITY python-md5sum        "3720ce9460597e49264bbb63b48b946d">
    10   <!ENTITY python-size          "8.5 MB">
    11   <!ENTITY python-buildsize     "141 MB (23MB for the test suite)">
    12   <!ENTITY python-time          "1 SBU (additional 2.9 SBU to run the test suite)">
    13   <!ENTITY pythonhtmldoc-download-http "http://docs.python.org/ftp/python/doc/&python-majorver;/python-&python-majorver;-docs-html.tar.bz2">
    14   <!ENTITY pythonhtmldoc-md5sum        "55af06e320f35920ea9fed1f143e1286">
    15   <!ENTITY pythonhtmldoc-size          "4.2 MB">
     7  <!ENTITY python3-download-http "http://www.python.org/ftp/python/&python3-version;/Python-&python3-version;.tar.xz">
     8  <!ENTITY python3-download-ftp  "&gentoo-ftp-repo;/Python-&python3-version;.tar.xz">
     9  <!ENTITY python3-md5sum        "3720ce9460597e49264bbb63b48b946d">
     10  <!ENTITY python3-size          "8.5 MB">
     11  <!ENTITY python3-buildsize     "141 MB (23MB for the test suite)">
     12  <!ENTITY python3-time          "1 SBU (additional 2.9 SBU to run the test suite)">
     13  <!ENTITY python3htmldoc-download-http "http://docs.python.org/ftp/python/doc/&python3-majorver;/python3-&python3-majorver;-docs-html.tar.bz2">
     14  <!ENTITY python3htmldoc-md5sum        "55af06e320f35920ea9fed1f143e1286">
     15  <!ENTITY python3htmldoc-size          "4.2 MB">
    1616]>
    1717
    18 <sect1 id="python" xreflabel="Python-&python-version;">
    19   <?dbhtml filename="python.html" ?>
     18<sect1 id="python3" xreflabel="Python-&python3-version;">
     19  <?dbhtml filename="python3.html" ?>
    2020
    2121  <sect1info>
    … …  
    2424  </sect1info>
    2525
    26   <title>Python-&python-version;</title>
    27 
    28   <indexterm zone="python">
    29     <primary sortas="a-Python">Python</primary>
     26  <title>Python-&python3-version;</title>
     27
     28  <indexterm zone="python3">
     29    <primary sortas="a-Python3">Python</primary>
    3030  </indexterm>
    3131
    … …  
    4646    <itemizedlist spacing="compact">
    4747      <listitem>
    48         <para>Download (HTTP): <ulink url="&python-download-http;"/></para>
    49       </listitem>
    50       <listitem>
    51         <para>Download (FTP): <ulink url="&python-download-ftp;"/></para>
    52       </listitem>
    53       <listitem>
    54         <para>Download MD5 sum: &python-md5sum;</para>
    55       </listitem>
    56       <listitem>
    57         <para>Download size: &python-size;</para>
    58       </listitem>
    59       <listitem>
    60         <para>Estimated disk space required: &python-buildsize;</para>
    61       </listitem>
    62       <listitem>
    63         <para>Estimated build time: &python-time;</para>
     48        <para>Download (HTTP): <ulink url="&python3-download-http;"/></para>
     49      </listitem>
     50      <listitem>
     51        <para>Download (FTP): <ulink url="&python3-download-ftp;"/></para>
     52      </listitem>
     53      <listitem>
     54        <para>Download MD5 sum: &python3-md5sum;</para>
     55      </listitem>
     56      <listitem>
     57        <para>Download size: &python3-size;</para>
     58      </listitem>
     59      <listitem>
     60        <para>Estimated disk space required: &python3-buildsize;</para>
     61      </listitem>
     62      <listitem>
     63        <para>Estimated build time: &python3-time;</para>
    6464      </listitem>
    6565    </itemizedlist>
    … …  
    7676      <title>Optional HTML Documentation</title>
    7777      <listitem>
    78         <para>Download (HTTP): <ulink url="&pythonhtmldoc-download-http;"/></para>
    79       </listitem>
    80       <listitem>
    81         <para>Download MD5 sum: &pythonhtmldoc-md5sum;</para>
    82       </listitem>
    83       <listitem>
    84         <para>Download size: &pythonhtmldoc-size;</para>
     78        <para>Download (HTTP): <ulink url="&python3htmldoc-download-http;"/></para>
     79      </listitem>
     80      <listitem>
     81        <para>Download MD5 sum: &python3htmldoc-md5sum;</para>
     82      </listitem>
     83      <listitem>
     84        <para>Download size: &python3htmldoc-size;</para>
    8585      </listitem>
    8686    </itemizedlist>
    … …  
    142142    <systemitem class="username">root</systemitem> user:</para>
    143143
    144 <screen role="root"><userinput>install -v -m755 -d /usr/share/doc/Python-&python-version;/html &amp;&amp;
     144<screen role="root"><userinput>install -v -m755 -d /usr/share/doc/Python-&python3-version;/html &amp;&amp;
    145145tar --strip-components=1 \
    146146    --no-same-owner \
    147147    --no-same-permissions \
    148     -C /usr/share/doc/Python-&python-version;/html \
    149     -xvf ../python-&python-majorver;-docs-html.tar.bz2</userinput></screen>
     148    -C /usr/share/doc/Python-&python3-version;/html \
     149    -xvf ../python-&python3-majorver;-docs-html.tar.bz2</userinput></screen>
    150150
    151151  </sect2>
    … …  
    167167    individual user's or the system's profile:</para>
    168168
    169     <screen role="root"><userinput>export PYTHONDOCS=/usr/share/doc/Python-&python-version;/html</userinput></screen>
     169    <screen role="root"><userinput>export PYTHONDOCS=/usr/share/doc/Python-&python3-version;/html</userinput></screen>
    170170
    171171  </sect2>
    … …  
    180180
    181181      <seglistitem>
    182         <seg>2to3, pydoc, python, python-config, python&python-majorver;,
    183         python&python-majorver;-config, smtpd.py, and optionally if
     182        <seg>2to3, pydoc, python3, python3-config, python&python3-majorver;,
     183        python&python3-majorver;-config, smtpd.py, and optionally if
    184184        <application>Tk</application> is installed, idle</seg>
    185         <seg>libpython&python-majorver;.so and numerous modules installed in
    186         /usr/lib/python&python-majorver;/lib-dynload</seg>
    187         <seg>/usr/include/python&python-majorver;,
    188         /usr/lib/python&python-majorver;, and
    189         /usr/share/doc/python-&python-version;</seg>
     185        <seg>libpython&python3-majorver;.so and numerous modules installed in
     186        /usr/lib/python&python3-majorver;/lib-dynload</seg>
     187        <seg>/usr/include/python&python3-majorver;,
     188        /usr/lib/python&python3-majorver;, and
     189        /usr/share/doc/python-&python3-version;</seg>
    190190      </seglistitem>
    191191    </segmentedlist>
    … …  
    201201          <para>is a wrapper script that opens a
    202202          <application>Python</application> aware GUI editor.</para>
    203           <indexterm zone="python idle">
     203          <indexterm zone="python3 idle">
    204204            <primary sortas="b-idle">idle</primary>
    205205          </indexterm>
    … …  
    212212          <para>is the <application>Python</application> documentation
    213213          tool.</para>
    214           <indexterm zone="python pydoc">
     214          <indexterm zone="python3 pydoc">
    215215            <primary sortas="b-pydoc">pydoc</primary>
    216216          </indexterm>
    … …  
    218218      </varlistentry>
    219219
    220       <varlistentry id="python-prog">
     220      <varlistentry id="python3-prog">
    221221        <term><command>python</command></term>
    222222        <listitem>
    223223          <para>is an interpreted, interactive, object-oriented programming
    224224          language.</para>
    225           <indexterm zone="python python-prog">
    226             <primary sortas="b-python">python</primary>
     225          <indexterm zone="python3 python3-prog">
     226            <primary sortas="b-python3">python3</primary>
    227227          </indexterm>
    228228        </listitem>
    … …  
    230230
    231231      <varlistentry id="python-ver">
    232         <term><command>python&python-majorver;</command></term>
     232        <term><command>python&python3-majorver;</command></term>
    233233        <listitem>
    234234          <para>is a version-specific name for the <command>python</command>
    235235          program.</para>
    236           <indexterm zone="python python-ver">
    237             <primary sortas="b-python&python-majorver;">python&python-majorver;</primary>
     236          <indexterm zone="python3 python-ver">
     237            <primary sortas="b-python&python3-majorver;">python&python3-majorver;</primary>
    238238          </indexterm>
    239239        </listitem>
    … …  
    245245          <para>is an SMTP proxy implemented in
    246246          <application>Python</application>.</para>
    247           <indexterm zone="python smtpd.py">
     247          <indexterm zone="python3 smtpd.py">
    248248            <primary sortas="b-smtpd.py">smtpd.py</primary>
    249249          </indexterm>

  • general/prog/python2.xml

    r1365d551 rb88be39  
    1616]>
    1717
    18 <sect1 id="python2" xreflabel="Python-&python2-version;">
     18<sect1 id="python" xreflabel="Python-&python2-version;">
    1919  <?dbhtml filename="python2.html" ?>
    2020
    … …  
    2626  <title>Python-&python2-version;</title>
    2727
    28   <indexterm zone="python2">
     28  <indexterm zone="python">
    2929    <primary sortas="a-Python2">Python</primary>
    3030  </indexterm>
    … …  
    196196          <para>is a wrapper script that opens a
    197197          <application>Python</application> aware GUI editor.</para>
    198           <indexterm zone="python2 idle2">
     198          <indexterm zone="python idle2">
    199199            <primary sortas="b-idle2">idle</primary>
    200200          </indexterm>
    … …  
    207207          <para>is the <application>Python</application> documentation
    208208          tool.</para>
    209           <indexterm zone="python2 pydoc2">
     209          <indexterm zone="python pydoc2">
    210210            <primary sortas="b-pydoc2">pydoc</primary>
    211211          </indexterm>
    … …  
    218218          <para>is an interpreted, interactive, object-oriented programming
    219219          language.</para>
    220           <indexterm zone="python2 python2-prog">
    221             <primary sortas="b-python2">python</primary>
     220          <indexterm zone="python python2-prog">
     221            <primary sortas="b-python">python</primary>
    222222          </indexterm>
    223223        </listitem>
    … …  
    229229          <para>is a version-specific name for the <command>python</command>
    230230          program.</para>
    231           <indexterm zone="python2 python2-ver">
    232             <primary sortas="b-python&python-majorver;">python&python-majorver;</primary>
     231          <indexterm zone="python python2-ver">
     232            <primary sortas="b-python&python2-majorver;">python&python2-majorver;</primary>
    233233          </indexterm>
    234234        </listitem>
    … …  
    240240          <para>is an SMTP proxy implemented in
    241241          <application>Python</application>.</para>
    242           <indexterm zone="python2 smtpd.py2">
     242          <indexterm zone="python smtpd.py2">
    243243            <primary sortas="b-smtpd.py2">smtpd.py</primary>
    244244          </indexterm>

  • general/sysutils/cmake.xml

    r1365d551 rb88be39  
    77  <!ENTITY cmake-download-http "http://www.cmake.org/files/v2.8/cmake-&cmake-version;.tar.gz">
    88  <!ENTITY cmake-download-ftp  " ">
    9   <!ENTITY cmake-md5sum        "a76a44b93acf5e3badda9de111385921">
     9  <!ENTITY cmake-md5sum        "2147da452fd9212bb9b4542a9eee9d5b">
    1010  <!ENTITY cmake-size          "5.3 MB">
    11   <!ENTITY cmake-buildsize     "132 MB">
    12   <!ENTITY cmake-time          "1.3 SBU">
     11  <!ENTITY cmake-buildsize     "303 MB (including tests)">
     12  <!ENTITY cmake-time          "4.1 SBU (including 2.5 SBU test time)">
    1313]>
    1414
    … …  
    5858    </itemizedlist>
    5959
    60 <!--
    61     <bridgehead renderas="sect3">Additional Downloads</bridgehead>
    62     <itemizedlist spacing='compact'>
    63       <listitem>
    64         <para>Required patch: <ulink
    65         url="&patch-root;/cmake-&cmake-version;-fixes-1.patch"/></para>
    66       </listitem>
    67     </itemizedlist>
    68 -->
    69 
    7060    <bridgehead renderas="sect3">CMake Dependencies</bridgehead>
    7161
    7262    <bridgehead renderas="sect4">Required</bridgehead>
    7363    <para role="required">
    74     <xref linkend="curl"/>,
    75     <xref linkend="libarchive"/>, and
    76     <xref linkend="expat"/>
     64      <xref linkend="curl"/>,
     65      <xref linkend="libarchive"/>, and
     66      <xref linkend="expat"/>
     67    </para>
     68
     69    <bridgehead renderas="sect4">Options</bridgehead>
     70    <para role="optional">
     71      <xref linkend="subversion"/> (for testing)
    7772    </para>
    7873
    … …  
    8883    commands:</para>
    8984
    90 <screen><userinput>./bootstrap --prefix=/usr \
    91             --system-libs \
     85<screen><userinput>./bootstrap --prefix=/usr       \
     86            --system-libs       \
    9287            --mandir=/share/man \
    9388            --docdir=/share/doc/cmake-&cmake-version; &amp;&amp;
    9489make</userinput></screen>
     90
     91    <para>To test the results, issue: <userinput>make test</userinput>.
     92    The SVN test may fail.</para>
    9593
    9694    <para>Now, as the <systemitem class="username">root</systemitem> user:</para>

  • general/sysutils/libarchive.xml

    r1365d551 rb88be39  
    77  <!ENTITY libarchive-download-http "http://libarchive.googlecode.com/files/libarchive-&libarchive-version;.tar.gz">
    88  <!ENTITY libarchive-download-ftp  " ">
    9   <!ENTITY libarchive-md5sum        "83b237a542f27969a8d68ac217dc3796">
    10   <!ENTITY libarchive-size          "1.5 MB">
    11   <!ENTITY libarchive-buildsize     "18 MB">
    12   <!ENTITY libarchive-time          "0.2 SBU">
     9  <!ENTITY libarchive-md5sum        "9caf51dcf6213e9c9f5a1c27448b9c90">
     10  <!ENTITY libarchive-size          "1.4 MB">
     11  <!ENTITY libarchive-buildsize     "25 MB">
     12  <!ENTITY libarchive-time          "0.3 SBU">
    1313]>
    1414
    … …  
    3333    reading/writing various compression formats.</para>
    3434
    35     &lfs67_checked;
     35    &lfs70_checked;
    3636
    3737    <bridgehead renderas="sect3">Package Information</bridgehead>
    … …  
    8888make</userinput></screen>
    8989
     90    <para>To test the results, issue: <userinput>make check</userinput>.</para>
     91
    9092    <para>Now, as the <systemitem class="username">root</systemitem> user:</para>
    9193
Note: See TracChangeset for help on using the changeset viewer.