[pypy-commit] pypy.org extradoc: merge

[fijal]

Author: Maciej Fijalkowski <fijall at gmail.com>
Branch: extradoc
Changeset: r310:7e272a0d59d0
Date: 2012-01-31 00:08 +0200
http://bitbucket.org/pypy/pypy.org/changeset/7e272a0d59d0/

Log:	merge

diff --git a/download.html b/download.html
--- a/download.html
+++ b/download.html
@@ -56,7 +56,10 @@
 <li><a class="reference internal" href="#other-versions">Other versions</a></li>
 </ul>
 </li>
-<li><a class="reference internal" href="#installing">Installing</a> (optional)</li>
+<li><a class="reference internal" href="#installing">Installing</a> (optional)<ul>
+<li><a class="reference internal" href="#linux-libraries">Linux libraries</a></li>
+</ul>
+</li>
 <li><a class="reference internal" href="#building-from-source">Building from source</a></li>
 <li><a class="reference internal" href="#packaging">Packaging</a></li>
 <li><a class="reference internal" href="#checksums">Checksums</a></li>
@@ -70,8 +73,8 @@
 (This is the official release 1.7;
 for the most up-to-date version see below.)</p>
 <ul class="simple">
-<li><a class="reference external" href="https://bitbucket.org/pypy/pypy/downloads/pypy-1.7-linux.tar.bz2">Linux binary (32bit)</a></li>
-<li><a class="reference external" href="https://bitbucket.org/pypy/pypy/downloads/pypy-1.7-linux64.tar.bz2">Linux binary (64bit)</a></li>
+<li><a class="reference external" href="https://bitbucket.org/pypy/pypy/downloads/pypy-1.7-linux.tar.bz2">Linux binary (32bit)</a> (<a class="reference internal" href="#openssl0-9-8-notes">openssl0.9.8 notes</a>)</li>
+<li><a class="reference external" href="https://bitbucket.org/pypy/pypy/downloads/pypy-1.7-linux64.tar.bz2">Linux binary (64bit)</a> (<a class="reference internal" href="#openssl0-9-8-notes">openssl0.9.8 notes</a>)</li>
 <li><a class="reference external" href="https://bitbucket.org/pypy/pypy/downloads/pypy-1.7-osx64.tar.bz2">Mac OS/X binary (64bit)</a></li>
 <li><a class="reference external" href="https://bitbucket.org/pypy/pypy/downloads/pypy-1.7-win32.zip">Windows binary (32bit)</a></li>
 </ul><p>If your CPU is really old, it may not have SSE2.  In this case, you need
@@ -105,6 +108,15 @@
 not move or copy the executable <tt class="docutils literal">pypy</tt> outside the tree &ndash; put
 a symlink to it, otherwise it will not find its libraries.</p>
 </div>
+<div class="section" id="linux-libraries">
+<span id="openssl0-9-8-notes"></span><h1>Linux libraries</h1>
+<p>Linux binaries require a system with the correct set of libraries.
+Right now one problem is OpenSSL, which some distributions distribute in
+version 0.9.8 and others in version 1.0.0.  The binaries require 0.9.8.
+If you can't install it in your distribution, pick it the latest
+<a class="reference external" href="http://www.openssl.org/source/">openssl-0.9.8*.tar.gz from sources</a> and install it with <tt class="docutils literal">./config
+shared; make; make install</tt>.</p>
+</div>
 <div class="section" id="building-from-source">
 <span id="translate"></span><h1>Building from source</h1>
 <ol class="arabic">
diff --git a/source/download.txt b/source/download.txt
--- a/source/download.txt
+++ b/source/download.txt
@@ -23,6 +23,9 @@
    * `Other versions`_
 
  * `Installing`_ (optional)                      
+ 
+   * `Linux libraries`_
+
  * `Building from source`_                       
  * `Packaging`_
  * `Checksums`_
@@ -39,8 +42,8 @@
 (This is the official release 1.7;
 for the most up-to-date version see below.)
 
-* `Linux binary (32bit)`__
-* `Linux binary (64bit)`__
+* `Linux binary (32bit)`__ (`openssl0.9.8 notes`_)
+* `Linux binary (64bit)`__ (`openssl0.9.8 notes`_)
 * `Mac OS/X binary (64bit)`__
 * `Windows binary (32bit)`__
 
@@ -91,6 +94,21 @@
 a symlink to it, otherwise it will not find its libraries.
 
 
+.. _`openssl0.9.8 notes`:
+
+Linux libraries
+---------------
+
+Linux binaries require a system with the correct set of libraries.
+Right now one problem is OpenSSL, which some distributions distribute in
+version 0.9.8 and others in version 1.0.0.  The binaries require 0.9.8.
+If you can't install it in your distribution, pick it the latest
+`openssl-0.9.8*.tar.gz from sources`__ and install it with ``./config
+shared; make; make install``.
+
+.. __: http://www.openssl.org/source/
+
+
 .. _translate:
 
 Building from source