Permalink
Browse files

Merge with master

  • Loading branch information...
2 parents 840cebb + 40efa3b commit 800be2e333d622b25c49ebb45dd26b78421e7589 @silviot committed Apr 24, 2012
Showing with 29 additions and 0 deletions.
  1. +7 −0 docs/CHANGES.txt
  2. +4 −0 src/osdetect.py
  3. +12 −0 src/py256.txt
  4. +6 −0 src/python25.cfg
View
@@ -23,6 +23,13 @@ Changes
and Python 3.2.3rc1.
[hannosch]
+2012-02-14
+----------
+
+- Added patch for python 2.5 to search for libs in /usr/lib/i386-linux-gnu/.
+ Fixes bug in Linux Mint 12 and Ubuntu 11.10 (and probably elsewhere).
+ [silviot]
+
2012-01-29
----------
View
@@ -1,6 +1,7 @@
def osdetect(buildout):
import sys
import platform
+ import os
platforms = ['default']
if sys.platform == 'darwin':
@@ -17,6 +18,9 @@ def osdetect(buildout):
elif platform.machine() == 'x86_64':
platforms.insert(0, 'x86_64')
+ if os.path.exists('/usr/lib/i386-linux-gnu'):
+ platforms.insert(0, 'i386-linux-gnu')
+
buildout._logger.debug("Detected these platforms: %s" % ", ".join(platforms))
variants = {}
View
@@ -0,0 +1,12 @@
+diff -u setup.py setup.py
+--- setup.py 2012-02-14 17:54:53.441827578 +0100
++++ setup.py 2012-02-14 17:55:34.414030770 +0100
+@@ -296,7 +296,7 @@
+ # if a file is found in one of those directories, it can
+ # be assumed that no additional -I,-L directives are needed.
+ lib_dirs = self.compiler.library_dirs + [
+- '/lib64', '/usr/lib64',
++ '/lib64', '/usr/lib64', '/usr/lib/i386-linux-gnu',
+ '/lib', '/usr/lib',
+ ]
+ inc_dirs = self.compiler.include_dirs + ['/usr/include']
View
@@ -18,6 +18,12 @@ extra_options =
--disable-tk
--prefix=${opt:location}
+[python-2.5-build:i386-linux-gnu]
+<= python-2.5-build:default
+# This patch fixes an issue in Linux Mint 12 (and possibly other distros)
+# where make won't find libs in /usr/lib/i386-linux-gnu
+patch = ${buildout:python-buildout-root}/py256.txt
+
[python-2.5-build:darwin-snowleopard]
<= python-2.5-build:default
patch = ${buildout:python-buildout-root}/python-2.5-darwin-10.6.patch

0 comments on commit 800be2e

Please sign in to comment.