bakabtw/packages
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[packages/python] partially revert commit 31092, apply changes for real now - stupid me..

Browse Source 
git-svn-id: svn://svn.openwrt.org/openwrt/packages@31140 3c298f89-4303-0410-b956-a3cf2f4a3e73
This commit is contained in:
mirko
2012-03-29 14:11:26 +00:00
parent ff029ef59c
commit 5015286f7f
13 changed files with 119 additions and 888 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
lang/python/patches/030-fixup-include-dirs.patch
View File

@ -4,29 +4,37 @@
--- a/setup.py
+++ b/setup.py
@@ -309,9 +309,6 @@ class PyBuildExt(build_ext):
return sys.platform
@@ -368,11 +368,6 @@ class PyBuildExt(build_ext):
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.
@@ -347,11 +344,6 @@ class PyBuildExt(build_ext):
# We must get the values from the Makefile and not the environment
@@ -407,17 +402,6 @@ class PyBuildExt(build_ext):
for directory in reversed(options.dirs):
add_dir_to_list(dir_list, directory)
- if os.path.normpath(sys.prefix) != '/usr':
- if os.path.normpath(sys.prefix) != '/usr' \
- and not sysconfig.get_config_var('PYTHONFRAMEWORK'):
- # OSX note: Don't add LIBDIR and INCLUDEDIR to building a framework
- # (PYTHONFRAMEWORK is set) to avoid # linking problems when
- # building a framework with different architectures than
- # the one that is currently installed (issue #7473)
- add_dir_to_list(self.compiler.library_dirs,
- sysconfig.get_config_var("LIBDIR"))
- add_dir_to_list(self.compiler.include_dirs,
- sysconfig.get_config_var("INCLUDEDIR"))
-
try:
have_unicode = unicode
@@ -361,11 +353,8 @@ class PyBuildExt(build_ext):
except NameError:
@@ -426,11 +410,8 @@ class PyBuildExt(build_ext):
# lib_dirs and inc_dirs are used to search for files;
# if a file is found in one of those directories, it can
# be assumed that no additional -I,-L directives are needed.