@ -0,0 +1,47 @@ | |||
# HG changeset patch | |||
# User Barry Warsaw <barry@python.org> | |||
# Date 1302190091 14400 | |||
# Node ID bd0f73a9538e05f526feaf05821e68bdcff498fa | |||
# Parent 2e4cdaffe493e879fb5367a4aa454491de451137 | |||
Backport for Python 2.7 of issue 11715 support for building Python on | |||
multiarch Debian/Ubuntu. | |||
diff --git a/setup.py b/setup.py | |||
--- setup.py.orig | |||
+++ setup.py | |||
@@ -345,10 +345,33 @@ class PyBuildExt(build_ext): | |||
return platform | |||
return sys.platform | |||
+ def add_multiarch_paths(self): | |||
+ # Debian/Ubuntu multiarch support. | |||
+ # https://wiki.ubuntu.com/MultiarchSpec | |||
+ if not find_executable('dpkg-architecture'): | |||
+ return | |||
+ tmpfile = os.path.join(self.build_temp, 'multiarch') | |||
+ if not os.path.exists(self.build_temp): | |||
+ os.makedirs(self.build_temp) | |||
+ ret = os.system( | |||
+ 'dpkg-architecture -qDEB_HOST_MULTIARCH > %s 2> /dev/null' % | |||
+ tmpfile) | |||
+ try: | |||
+ if ret >> 8 == 0: | |||
+ with open(tmpfile) as fp: | |||
+ multiarch_path_component = fp.readline().strip() | |||
+ add_dir_to_list(self.compiler.library_dirs, | |||
+ '/usr/lib/' + multiarch_path_component) | |||
+ add_dir_to_list(self.compiler.include_dirs, | |||
+ '/usr/include/' + multiarch_path_component) | |||
+ finally: | |||
+ os.unlink(tmpfile) | |||
+ | |||
def detect_modules(self): | |||
# Ensure that /usr/local is always used | |||
add_dir_to_list(self.compiler.library_dirs, '/usr/local/lib') | |||
add_dir_to_list(self.compiler.include_dirs, '/usr/local/include') | |||
+ self.add_multiarch_paths() | |||
# Add paths specified in the environment variables LDFLAGS and | |||
# CPPFLAGS for header and library files. | |||
@ -0,0 +1,47 @@ | |||
# HG changeset patch | |||
# User Barry Warsaw <barry@python.org> | |||
# Date 1302190091 14400 | |||
# Node ID bd0f73a9538e05f526feaf05821e68bdcff498fa | |||
# Parent 2e4cdaffe493e879fb5367a4aa454491de451137 | |||
Backport for Python 2.7 of issue 11715 support for building Python on | |||
multiarch Debian/Ubuntu. | |||
diff --git a/setup.py b/setup.py | |||
--- setup.py.orig | |||
+++ setup.py | |||
@@ -345,10 +345,33 @@ class PyBuildExt(build_ext): | |||
return platform | |||
return sys.platform | |||
+ def add_multiarch_paths(self): | |||
+ # Debian/Ubuntu multiarch support. | |||
+ # https://wiki.ubuntu.com/MultiarchSpec | |||
+ if not find_executable('dpkg-architecture'): | |||
+ return | |||
+ tmpfile = os.path.join(self.build_temp, 'multiarch') | |||
+ if not os.path.exists(self.build_temp): | |||
+ os.makedirs(self.build_temp) | |||
+ ret = os.system( | |||
+ 'dpkg-architecture -qDEB_HOST_MULTIARCH > %s 2> /dev/null' % | |||
+ tmpfile) | |||
+ try: | |||
+ if ret >> 8 == 0: | |||
+ with open(tmpfile) as fp: | |||
+ multiarch_path_component = fp.readline().strip() | |||
+ add_dir_to_list(self.compiler.library_dirs, | |||
+ '/usr/lib/' + multiarch_path_component) | |||
+ add_dir_to_list(self.compiler.include_dirs, | |||
+ '/usr/include/' + multiarch_path_component) | |||
+ finally: | |||
+ os.unlink(tmpfile) | |||
+ | |||
def detect_modules(self): | |||
# Ensure that /usr/local is always used | |||
add_dir_to_list(self.compiler.library_dirs, '/usr/local/lib') | |||
add_dir_to_list(self.compiler.include_dirs, '/usr/local/include') | |||
+ self.add_multiarch_paths() | |||
# Add paths specified in the environment variables LDFLAGS and | |||
# CPPFLAGS for header and library files. | |||
@ -0,0 +1,47 @@ | |||
# HG changeset patch | |||
# User Barry Warsaw <barry@python.org> | |||
# Date 1302190091 14400 | |||
# Node ID bd0f73a9538e05f526feaf05821e68bdcff498fa | |||
# Parent 2e4cdaffe493e879fb5367a4aa454491de451137 | |||
Backport for Python 2.7 of issue 11715 support for building Python on | |||
multiarch Debian/Ubuntu. | |||
diff --git a/setup.py b/setup.py | |||
--- setup.py.orig | |||
+++ setup.py | |||
@@ -345,10 +345,33 @@ class PyBuildExt(build_ext): | |||
return platform | |||
return sys.platform | |||
+ def add_multiarch_paths(self): | |||
+ # Debian/Ubuntu multiarch support. | |||
+ # https://wiki.ubuntu.com/MultiarchSpec | |||
+ if not find_executable('dpkg-architecture'): | |||
+ return | |||
+ tmpfile = os.path.join(self.build_temp, 'multiarch') | |||
+ if not os.path.exists(self.build_temp): | |||
+ os.makedirs(self.build_temp) | |||
+ ret = os.system( | |||
+ 'dpkg-architecture -qDEB_HOST_MULTIARCH > %s 2> /dev/null' % | |||
+ tmpfile) | |||
+ try: | |||
+ if ret >> 8 == 0: | |||
+ with open(tmpfile) as fp: | |||
+ multiarch_path_component = fp.readline().strip() | |||
+ add_dir_to_list(self.compiler.library_dirs, | |||
+ '/usr/lib/' + multiarch_path_component) | |||
+ add_dir_to_list(self.compiler.include_dirs, | |||
+ '/usr/include/' + multiarch_path_component) | |||
+ finally: | |||
+ os.unlink(tmpfile) | |||
+ | |||
def detect_modules(self): | |||
# Ensure that /usr/local is always used | |||
add_dir_to_list(self.compiler.library_dirs, '/usr/local/lib') | |||
add_dir_to_list(self.compiler.include_dirs, '/usr/local/include') | |||
+ self.add_multiarch_paths() | |||
# Add paths specified in the environment variables LDFLAGS and | |||
# CPPFLAGS for header and library files. | |||
@ -0,0 +1,47 @@ | |||
# HG changeset patch | |||
# User Barry Warsaw <barry@python.org> | |||
# Date 1302190091 14400 | |||
# Node ID bd0f73a9538e05f526feaf05821e68bdcff498fa | |||
# Parent 2e4cdaffe493e879fb5367a4aa454491de451137 | |||
Backport for Python 2.7 of issue 11715 support for building Python on | |||
multiarch Debian/Ubuntu. | |||
diff --git a/setup.py b/setup.py | |||
--- setup.py.orig | |||
+++ setup.py | |||
@@ -345,10 +345,33 @@ class PyBuildExt(build_ext): | |||
return platform | |||
return sys.platform | |||
+ def add_multiarch_paths(self): | |||
+ # Debian/Ubuntu multiarch support. | |||
+ # https://wiki.ubuntu.com/MultiarchSpec | |||
+ if not find_executable('dpkg-architecture'): | |||
+ return | |||
+ tmpfile = os.path.join(self.build_temp, 'multiarch') | |||
+ if not os.path.exists(self.build_temp): | |||
+ os.makedirs(self.build_temp) | |||
+ ret = os.system( | |||
+ 'dpkg-architecture -qDEB_HOST_MULTIARCH > %s 2> /dev/null' % | |||
+ tmpfile) | |||
+ try: | |||
+ if ret >> 8 == 0: | |||
+ with open(tmpfile) as fp: | |||
+ multiarch_path_component = fp.readline().strip() | |||
+ add_dir_to_list(self.compiler.library_dirs, | |||
+ '/usr/lib/' + multiarch_path_component) | |||
+ add_dir_to_list(self.compiler.include_dirs, | |||
+ '/usr/include/' + multiarch_path_component) | |||
+ finally: | |||
+ os.unlink(tmpfile) | |||
+ | |||
def detect_modules(self): | |||
# Ensure that /usr/local is always used | |||
add_dir_to_list(self.compiler.library_dirs, '/usr/local/lib') | |||
add_dir_to_list(self.compiler.include_dirs, '/usr/local/include') | |||
+ self.add_multiarch_paths() | |||
# Add paths specified in the environment variables LDFLAGS and | |||
# CPPFLAGS for header and library files. | |||
@ -0,0 +1,47 @@ | |||
# HG changeset patch | |||
# User Barry Warsaw <barry@python.org> | |||
# Date 1302190091 14400 | |||
# Node ID bd0f73a9538e05f526feaf05821e68bdcff498fa | |||
# Parent 2e4cdaffe493e879fb5367a4aa454491de451137 | |||
Backport for Python 2.7 of issue 11715 support for building Python on | |||
multiarch Debian/Ubuntu. | |||
diff --git a/setup.py b/setup.py | |||
--- setup.py.orig | |||
+++ setup.py | |||
@@ -345,10 +345,33 @@ class PyBuildExt(build_ext): | |||
return platform | |||
return sys.platform | |||
+ def add_multiarch_paths(self): | |||
+ # Debian/Ubuntu multiarch support. | |||
+ # https://wiki.ubuntu.com/MultiarchSpec | |||
+ if not find_executable('dpkg-architecture'): | |||
+ return | |||
+ tmpfile = os.path.join(self.build_temp, 'multiarch') | |||
+ if not os.path.exists(self.build_temp): | |||
+ os.makedirs(self.build_temp) | |||
+ ret = os.system( | |||
+ 'dpkg-architecture -qDEB_HOST_MULTIARCH > %s 2> /dev/null' % | |||
+ tmpfile) | |||
+ try: | |||
+ if ret >> 8 == 0: | |||
+ with open(tmpfile) as fp: | |||
+ multiarch_path_component = fp.readline().strip() | |||
+ add_dir_to_list(self.compiler.library_dirs, | |||
+ '/usr/lib/' + multiarch_path_component) | |||
+ add_dir_to_list(self.compiler.include_dirs, | |||
+ '/usr/include/' + multiarch_path_component) | |||
+ finally: | |||
+ os.unlink(tmpfile) | |||
+ | |||
def detect_modules(self): | |||
# Ensure that /usr/local is always used | |||
add_dir_to_list(self.compiler.library_dirs, '/usr/local/lib') | |||
add_dir_to_list(self.compiler.include_dirs, '/usr/local/include') | |||
+ self.add_multiarch_paths() | |||
# Add paths specified in the environment variables LDFLAGS and | |||
# CPPFLAGS for header and library files. | |||
@ -0,0 +1,44 @@ | |||
--- setup.py.orig 2011-07-07 19:41:48.610196111 +0900 | |||
+++ setup.py 2011-07-07 19:46:44.986310031 +0900 | |||
@@ -14,6 +14,7 @@ | |||
from distutils.command.build_ext import build_ext | |||
from distutils.command.install import install | |||
from distutils.command.install_lib import install_lib | |||
+from distutils.spawn import find_executable | |||
# This global variable is used to hold the list of modules to be disabled. | |||
disabled_module_list = [] | |||
@@ -308,10 +309,33 @@ | |||
return platform | |||
return sys.platform | |||
+ def add_multiarch_paths(self): | |||
+ # Debian/Ubuntu multiarch support. | |||
+ # https://wiki.ubuntu.com/MultiarchSpec | |||
+ if not find_executable('dpkg-architecture'): | |||
+ return | |||
+ tmpfile = os.path.join(self.build_temp, 'multiarch') | |||
+ if not os.path.exists(self.build_temp): | |||
+ os.makedirs(self.build_temp) | |||
+ ret = os.system( | |||
+ 'dpkg-architecture -qDEB_HOST_MULTIARCH > %s 2> /dev/null' % | |||
+ tmpfile) | |||
+ try: | |||
+ if ret >> 8 == 0: | |||
+ with open(tmpfile) as fp: | |||
+ multiarch_path_component = fp.readline().strip() | |||
+ add_dir_to_list(self.compiler.library_dirs, | |||
+ '/usr/lib/' + multiarch_path_component) | |||
+ add_dir_to_list(self.compiler.include_dirs, | |||
+ '/usr/include/' + multiarch_path_component) | |||
+ finally: | |||
+ os.unlink(tmpfile) | |||
+ | |||
def detect_modules(self): | |||
# Ensure that /usr/local is always used | |||
add_dir_to_list(self.compiler.library_dirs, '/usr/local/lib') | |||
add_dir_to_list(self.compiler.include_dirs, '/usr/local/include') | |||
+ self.add_multiarch_paths() | |||
# Add paths specified in the environment variables LDFLAGS and | |||
# CPPFLAGS for header and library files. |
@ -0,0 +1,47 @@ | |||
# HG changeset patch | |||
# User Barry Warsaw <barry@python.org> | |||
# Date 1302190091 14400 | |||
# Node ID bd0f73a9538e05f526feaf05821e68bdcff498fa | |||
# Parent 2e4cdaffe493e879fb5367a4aa454491de451137 | |||
Backport for Python 2.7 of issue 11715 support for building Python on | |||
multiarch Debian/Ubuntu. | |||
diff --git a/setup.py b/setup.py | |||
--- setup.py.orig | |||
+++ setup.py | |||
@@ -345,10 +345,33 @@ class PyBuildExt(build_ext): | |||
return platform | |||
return sys.platform | |||
+ def add_multiarch_paths(self): | |||
+ # Debian/Ubuntu multiarch support. | |||
+ # https://wiki.ubuntu.com/MultiarchSpec | |||
+ if not find_executable('dpkg-architecture'): | |||
+ return | |||
+ tmpfile = os.path.join(self.build_temp, 'multiarch') | |||
+ if not os.path.exists(self.build_temp): | |||
+ os.makedirs(self.build_temp) | |||
+ ret = os.system( | |||
+ 'dpkg-architecture -qDEB_HOST_MULTIARCH > %s 2> /dev/null' % | |||
+ tmpfile) | |||
+ try: | |||
+ if ret >> 8 == 0: | |||
+ with open(tmpfile) as fp: | |||
+ multiarch_path_component = fp.readline().strip() | |||
+ add_dir_to_list(self.compiler.library_dirs, | |||
+ '/usr/lib/' + multiarch_path_component) | |||
+ add_dir_to_list(self.compiler.include_dirs, | |||
+ '/usr/include/' + multiarch_path_component) | |||
+ finally: | |||
+ os.unlink(tmpfile) | |||
+ | |||
def detect_modules(self): | |||
# Ensure that /usr/local is always used | |||
add_dir_to_list(self.compiler.library_dirs, '/usr/local/lib') | |||
add_dir_to_list(self.compiler.include_dirs, '/usr/local/include') | |||
+ self.add_multiarch_paths() | |||
# Add paths specified in the environment variables LDFLAGS and | |||
# CPPFLAGS for header and library files. | |||
@ -0,0 +1,38 @@ | |||
--- setup.py.orig 2011-07-07 20:26:15.000000000 +0900 | |||
+++ setup.py 2011-07-07 20:29:28.735543350 +0900 | |||
@@ -370,12 +370,35 @@ | |||
return platform | |||
return sys.platform | |||
+ def add_multiarch_paths(self): | |||
+ # Debian/Ubuntu multiarch support. | |||
+ # https://wiki.ubuntu.com/MultiarchSpec | |||
+ if not find_executable('dpkg-architecture'): | |||
+ return | |||
+ tmpfile = os.path.join(self.build_temp, 'multiarch') | |||
+ if not os.path.exists(self.build_temp): | |||
+ os.makedirs(self.build_temp) | |||
+ ret = os.system( | |||
+ 'dpkg-architecture -qDEB_HOST_MULTIARCH > %s 2> /dev/null' % | |||
+ tmpfile) | |||
+ try: | |||
+ if ret >> 8 == 0: | |||
+ with open(tmpfile) as fp: | |||
+ multiarch_path_component = fp.readline().strip() | |||
+ add_dir_to_list(self.compiler.library_dirs, | |||
+ '/usr/lib/' + multiarch_path_component) | |||
+ add_dir_to_list(self.compiler.include_dirs, | |||
+ '/usr/include/' + multiarch_path_component) | |||
+ finally: | |||
+ os.unlink(tmpfile) | |||
+ | |||
def detect_modules(self): | |||
# Ensure that /usr/local is always used, but the local build | |||
# directories (i.e. '.' and 'Include') must be first. See issue | |||
# 10520. | |||
add_dir_to_list(self.compiler.library_dirs, '/usr/local/lib') | |||
add_dir_to_list(self.compiler.include_dirs, '/usr/local/include') | |||
+ self.add_multiarch_paths() | |||
# Add paths specified in the environment variables LDFLAGS and | |||
# CPPFLAGS for header and library files. |
@ -1,13 +1,3 @@ | |||
before_install_package() { | |||
local package_name="$1" | |||
case "$package_name" in | |||
Python*) | |||
http get "https://raw.github.com/saghul/pythonz/346450868902fed0fe654c472b7b58e2e31fde70/pythonz/patches/all/common/patch-setup.py.diff" setup.patch | |||
patch -p0 < setup.patch | |||
;; | |||
esac | |||
} | |||
install_package "Python-2.6.6" "http://www.python.org/ftp/python/2.6.6/Python-2.6.6.tgz#b2f209df270a33315e62c1ffac1937f0" | |||
install_package "distribute-0.6.36" "http://pypi.python.org/packages/source/d/distribute/distribute-0.6.36.tar.gz#a923385de72dcdca68cd4ac2b9dc1148" python | |||
install_package "pip-1.3.1" "http://pypi.python.org/packages/source/p/pip/pip-1.3.1.tar.gz#cbb27a191cebc58997c4da8513863153" python |
@ -1,13 +1,3 @@ | |||
before_install_package() { | |||
local package_name="$1" | |||
case "$package_name" in | |||
Python*) | |||
http get "https://raw.github.com/saghul/pythonz/346450868902fed0fe654c472b7b58e2e31fde70/pythonz/patches/all/common/patch-setup.py.diff" setup.patch | |||
patch -p0 < setup.patch | |||
;; | |||
esac | |||
} | |||
install_package "Python-2.6.7" "http://www.python.org/ftp/python/2.6.7/Python-2.6.7.tgz#af474f85a3af69ea50438a2a48039d7d" | |||
install_package "distribute-0.6.36" "http://pypi.python.org/packages/source/d/distribute/distribute-0.6.36.tar.gz#a923385de72dcdca68cd4ac2b9dc1148" python | |||
install_package "pip-1.3.1" "http://pypi.python.org/packages/source/p/pip/pip-1.3.1.tar.gz#cbb27a191cebc58997c4da8513863153" python |
@ -1,13 +1,3 @@ | |||
before_install_package() { | |||
local package_name="$1" | |||
case "$package_name" in | |||
Python*) | |||
http get "https://raw.github.com/saghul/pythonz/346450868902fed0fe654c472b7b58e2e31fde70/pythonz/patches/all/common/patch-setup.py.diff" setup.patch | |||
patch -p0 < setup.patch | |||
;; | |||
esac | |||
} | |||
install_package "Python-2.6.8" "http://www.python.org/ftp/python/2.6.8/Python-2.6.8.tgz#f6c1781f5d73ab7dfa5181f43ea065f6" | |||
install_package "distribute-0.6.36" "http://pypi.python.org/packages/source/d/distribute/distribute-0.6.36.tar.gz#a923385de72dcdca68cd4ac2b9dc1148" python | |||
install_package "pip-1.3.1" "http://pypi.python.org/packages/source/p/pip/pip-1.3.1.tar.gz#cbb27a191cebc58997c4da8513863153" python |
@ -1,13 +1,3 @@ | |||
before_install_package() { | |||
local package_name="$1" | |||
case "$package_name" in | |||
Python*) | |||
http get "https://raw.github.com/saghul/pythonz/346450868902fed0fe654c472b7b58e2e31fde70/pythonz/patches/all/common/patch-setup.py.diff" setup.patch | |||
patch -p0 < setup.patch | |||
;; | |||
esac | |||
} | |||
install_package "Python-2.7" "http://www.python.org/ftp/python/2.7/Python-2.7.tgz#35f56b092ecf39a6bd59d64f142aae0f" | |||
install_package "distribute-0.6.36" "http://pypi.python.org/packages/source/d/distribute/distribute-0.6.36.tar.gz#a923385de72dcdca68cd4ac2b9dc1148" python | |||
install_package "pip-1.3.1" "http://pypi.python.org/packages/source/p/pip/pip-1.3.1.tar.gz#cbb27a191cebc58997c4da8513863153" python |
@ -1,13 +1,3 @@ | |||
before_install_package() { | |||
local package_name="$1" | |||
case "$package_name" in | |||
Python*) | |||
http get "https://raw.github.com/saghul/pythonz/346450868902fed0fe654c472b7b58e2e31fde70/pythonz/patches/all/common/patch-setup.py.diff" setup.patch | |||
patch -p0 < setup.patch | |||
;; | |||
esac | |||
} | |||
install_package "Python-2.7.1" "http://www.python.org/ftp/python/2.7.1/Python-2.7.1.tgz#15ed56733655e3fab785e49a7278d2fb" | |||
install_package "distribute-0.6.36" "http://pypi.python.org/packages/source/d/distribute/distribute-0.6.36.tar.gz#a923385de72dcdca68cd4ac2b9dc1148" python | |||
install_package "pip-1.3.1" "http://pypi.python.org/packages/source/p/pip/pip-1.3.1.tar.gz#cbb27a191cebc58997c4da8513863153" python |
@ -1,13 +1,3 @@ | |||
before_install_package() { | |||
local package_name="$1" | |||
case "$package_name" in | |||
Python*) | |||
http get "https://raw.github.com/saghul/pythonz/346450868902fed0fe654c472b7b58e2e31fde70/pythonz/patches/all/python30/patch-setup.py.diff" setup.patch | |||
patch -p0 < setup.patch | |||
;; | |||
esac | |||
} | |||
install_package "Python-3.0.1" "http://www.python.org/ftp/python/3.0.1/Python-3.0.1.tgz#220b73f0a1a20c4b1cdf9f9db4cd52fe" | |||
install_package "distribute-0.6.36" "http://pypi.python.org/packages/source/d/distribute/distribute-0.6.36.tar.gz#a923385de72dcdca68cd4ac2b9dc1148" python | |||
install_package "pip-1.3.1" "http://pypi.python.org/packages/source/p/pip/pip-1.3.1.tar.gz#cbb27a191cebc58997c4da8513863153" python |
@ -1,13 +1,3 @@ | |||
before_install_package() { | |||
local package_name="$1" | |||
case "$package_name" in | |||
Python*) | |||
http get "https://raw.github.com/saghul/pythonz/346450868902fed0fe654c472b7b58e2e31fde70/pythonz/patches/all/common/patch-setup.py.diff" setup.patch | |||
patch -p0 < setup.patch | |||
;; | |||
esac | |||
} | |||
install_package "Python-3.1.3" "http://www.python.org/ftp/python/3.1.3/Python-3.1.3.tgz#d797fa6abe82c21227e328f05a535424" | |||
install_package "distribute-0.6.36" "http://pypi.python.org/packages/source/d/distribute/distribute-0.6.36.tar.gz#a923385de72dcdca68cd4ac2b9dc1148" python | |||
install_package "pip-1.3.1" "http://pypi.python.org/packages/source/p/pip/pip-1.3.1.tar.gz#cbb27a191cebc58997c4da8513863153" python |
@ -1,13 +1,3 @@ | |||
before_install_package() { | |||
local package_name="$1" | |||
case "$package_name" in | |||
Python*) | |||
http get "https://raw.github.com/saghul/pythonz/346450868902fed0fe654c472b7b58e2e31fde70/pythonz/patches/all/python32/patch-setup.py.diff" setup.patch | |||
patch -p0 < setup.patch | |||
;; | |||
esac | |||
} | |||
install_package "Python-3.2" "http://www.python.org/ftp/python/3.2/Python-3.2.tgz#5efe838a7878b170f6728d7e5d7517af" | |||
install_package "distribute-0.6.36" "http://pypi.python.org/packages/source/d/distribute/distribute-0.6.36.tar.gz#a923385de72dcdca68cd4ac2b9dc1148" python | |||
install_package "pip-1.3.1" "http://pypi.python.org/packages/source/p/pip/pip-1.3.1.tar.gz#cbb27a191cebc58997c4da8513863153" python |