python3: port some patches from python
Based on the idea that 'what-works-on-python-should-work-on-python3' because they share the same trunk, these patches have been copied over from the python package. Signed-off-by: Alexandru Ardelean <ardeleanalex@gmail.com>
This commit is contained in:
parent
741fdfd1e0
commit
cfe31ca3d3
|
@ -0,0 +1,31 @@
|
||||||
|
diff --git a/Modules/_ctypes/libffi/configure b/Modules/_ctypes/libffi/configure
|
||||||
|
index 75f62a7..4d6c9f2 100755
|
||||||
|
--- a/Modules/_ctypes/libffi/configure
|
||||||
|
+++ b/Modules/_ctypes/libffi/configure
|
||||||
|
@@ -17257,20 +17257,12 @@ case "$host" in
|
||||||
|
fi
|
||||||
|
;;
|
||||||
|
|
||||||
|
- i?86-*-* | x86_64-*-*)
|
||||||
|
- TARGETDIR=x86
|
||||||
|
- if test $ac_cv_sizeof_size_t = 4; then
|
||||||
|
- case "$host" in
|
||||||
|
- *-gnux32)
|
||||||
|
- TARGET=X86_64
|
||||||
|
- ;;
|
||||||
|
- *)
|
||||||
|
- TARGET=X86
|
||||||
|
- ;;
|
||||||
|
- esac
|
||||||
|
- else
|
||||||
|
- TARGET=X86_64;
|
||||||
|
- fi
|
||||||
|
+ i?86-*-*)
|
||||||
|
+ TARGET=X86; TARGETDIR=x86
|
||||||
|
+ ;;
|
||||||
|
+
|
||||||
|
+ x86_64-*-*)
|
||||||
|
+ TARGET=X86_64; TARGETDIR=x86
|
||||||
|
;;
|
||||||
|
|
||||||
|
ia64*-*-*)
|
|
@ -0,0 +1,12 @@
|
||||||
|
diff --git a/setup.py b/setup.py
|
||||||
|
index 7868b7b..9ae0ef2 100644
|
||||||
|
--- a/setup.py
|
||||||
|
+++ b/setup.py
|
||||||
|
@@ -444,7 +444,6 @@ class PyBuildExt(build_ext):
|
||||||
|
add_dir_to_list(self.compiler.include_dirs, '/usr/local/include')
|
||||||
|
if cross_compiling:
|
||||||
|
self.add_gcc_paths()
|
||||||
|
- self.add_multiarch_paths()
|
||||||
|
|
||||||
|
# Add paths specified in the environment variables LDFLAGS and
|
||||||
|
# CPPFLAGS for header and library files.
|
|
@ -0,0 +1,10 @@
|
||||||
|
--- a/Lib/distutils/command/build_scripts.py
|
||||||
|
+++ b/Lib/distutils/command/build_scripts.py
|
||||||
|
@@ -89,6 +89,7 @@ class build_scripts (Command):
|
||||||
|
adjust = 1
|
||||||
|
post_interp = match.group(1) or ''
|
||||||
|
|
||||||
|
+ adjust = 0
|
||||||
|
if adjust:
|
||||||
|
log.info("copying and adjusting %s -> %s", script,
|
||||||
|
self.build_dir)
|
|
@ -0,0 +1,15 @@
|
||||||
|
diff --git a/setup.py b/setup.py
|
||||||
|
index 7868b7b..544fa7e 100644
|
||||||
|
--- a/setup.py
|
||||||
|
+++ b/setup.py
|
||||||
|
@@ -452,8 +452,9 @@ class PyBuildExt(build_ext):
|
||||||
|
# directly since an inconsistently reproducible issue comes up where
|
||||||
|
# the environment variable is not set even though the value were passed
|
||||||
|
# into configure and stored in the Makefile (issue found on OS X 10.3).
|
||||||
|
+ rt_lib_dirs = [] if cross_compiling else self.compiler.runtime_library_dirs
|
||||||
|
for env_var, arg_name, dir_list in (
|
||||||
|
- ('LDFLAGS', '-R', self.compiler.runtime_library_dirs),
|
||||||
|
+ ('LDFLAGS', '-R', rt_lib_dirs),
|
||||||
|
('LDFLAGS', '-L', self.compiler.library_dirs),
|
||||||
|
('CPPFLAGS', '-I', self.compiler.include_dirs)):
|
||||||
|
env_val = sysconfig.get_config_var(env_var)
|
Loading…
Reference in New Issue