diff options
Diffstat (limited to 'dev-python/pypy3/files')
| -rw-r--r-- | dev-python/pypy3/files/7.0.0-gentoo-path.patch | 2 | ||||
| -rw-r--r-- | dev-python/pypy3/files/7.2.0-distutils-cxx.patch (renamed from dev-python/pypy3/files/7.0.0_all_distutils_cxx.patch) | 57 |
2 files changed, 9 insertions, 50 deletions
diff --git a/dev-python/pypy3/files/7.0.0-gentoo-path.patch b/dev-python/pypy3/files/7.0.0-gentoo-path.patch index 17409fa89a42..135e496f2536 100644 --- a/dev-python/pypy3/files/7.0.0-gentoo-path.patch +++ b/dev-python/pypy3/files/7.0.0-gentoo-path.patch @@ -39,7 +39,7 @@ index 77a1827d4b..255603967f 100644 if (hasattr(sys, 'pypy_version_info') and not name.endswith(('_user', '_home'))): - name = 'pypy' -+ if self.install_base == os.path.normpath('@EPREFIX@/usr/lib/pypy3.5'): ++ if self.install_base == os.path.normpath('@EPREFIX@/usr/lib/pypy3.6'): + # override paths for system-wide install + name = 'gentoo' + else: diff --git a/dev-python/pypy3/files/7.0.0_all_distutils_cxx.patch b/dev-python/pypy3/files/7.2.0-distutils-cxx.patch index a9099e5c9dc3..89a38050c804 100644 --- a/dev-python/pypy3/files/7.0.0_all_distutils_cxx.patch +++ b/dev-python/pypy3/files/7.2.0-distutils-cxx.patch @@ -1,43 +1,5 @@ -From 5c396fb8b644e5de82d9b54cdb088ea673e16e14 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Micha=C5=82=20G=C3=B3rny?= <mgorny@gentoo.org> -Date: Tue, 25 Apr 2017 17:42:33 +0200 -Subject: [PATCH] Fancy distutils C++ support, rebased for PyPy3.5/7.0.0 - -https://bugs.python.org/issue1222585 ---- - lib-python/3/_osx_support.py | 10 ++-- - lib-python/3/distutils/cygwinccompiler.py | 21 ++++++-- - lib-python/3/distutils/sysconfig_cpython.py | 25 ++++++++-- - lib-python/3/distutils/sysconfig_pypy.py | 34 ++++++++++--- - lib-python/3/distutils/unixccompiler.py | 54 +++++++++++---------- - lib_pypy/_sysconfigdata.py | 1 + - 6 files changed, 100 insertions(+), 45 deletions(-) - -diff --git a/lib-python/3/_osx_support.py b/lib-python/3/_osx_support.py -index 13fcd8b8d2..0525be1cbc 100644 ---- a/lib-python/3/_osx_support.py -+++ b/lib-python/3/_osx_support.py -@@ -14,13 +14,13 @@ __all__ = [ - # configuration variables that may contain universal build flags, - # like "-arch" or "-isdkroot", that may need customization for - # the user environment --_UNIVERSAL_CONFIG_VARS = ('CFLAGS', 'LDFLAGS', 'CPPFLAGS', 'BASECFLAGS', -- 'BLDSHARED', 'LDSHARED', 'CC', 'CXX', -- 'PY_CFLAGS', 'PY_LDFLAGS', 'PY_CPPFLAGS', -- 'PY_CORE_CFLAGS') -+_UNIVERSAL_CONFIG_VARS = ('CFLAGS', 'CXXFLAGS', 'LDFLAGS', 'CPPFLAGS', -+ 'BASECFLAGS', 'BLDSHARED', 'LDSHARED', 'LDCXXSHARED', -+ 'CC', 'CXX', 'PY_CFLAGS', 'PY_LDFLAGS', -+ 'PY_CPPFLAGS', 'PY_CORE_CFLAGS') - - # configuration variables that may contain compiler calls --_COMPILER_CONFIG_VARS = ('BLDSHARED', 'LDSHARED', 'CC', 'CXX') -+_COMPILER_CONFIG_VARS = ('BLDSHARED', 'LDSHARED', 'LDCXXSHARED', 'CC', 'CXX') - - # prefix added to original configuration variable names - _INITPRE = '_OSX_SUPPORT_INITIAL_' diff --git a/lib-python/3/distutils/cygwinccompiler.py b/lib-python/3/distutils/cygwinccompiler.py -index c879646c0f..a6157fbd5f 100644 +index 1c36990..ead3174 100644 --- a/lib-python/3/distutils/cygwinccompiler.py +++ b/lib-python/3/distutils/cygwinccompiler.py @@ -125,8 +125,10 @@ class CygwinCCompiler(UnixCCompiler): @@ -97,10 +59,10 @@ index c879646c0f..a6157fbd5f 100644 # Maybe we should also append -mthreads, but then the finished # dlls need another dll (mingwm10.dll see Mingw32 docs) diff --git a/lib-python/3/distutils/sysconfig_cpython.py b/lib-python/3/distutils/sysconfig_cpython.py -index 573724ddd7..0a04f33a86 100644 +index b8340f1..a8c5473 100644 --- a/lib-python/3/distutils/sysconfig_cpython.py +++ b/lib-python/3/distutils/sysconfig_cpython.py -@@ -173,9 +173,12 @@ def customize_compiler(compiler): +@@ -170,9 +170,12 @@ def customize_compiler(compiler): _osx_support.customize_compiler(_config_vars) _config_vars['CUSTOMIZED_OSX_COMPILER'] = 'True' @@ -116,7 +78,7 @@ index 573724ddd7..0a04f33a86 100644 if 'CC' in os.environ: newcc = os.environ['CC'] -@@ -190,19 +193,27 @@ def customize_compiler(compiler): +@@ -187,19 +190,27 @@ def customize_compiler(compiler): cxx = os.environ['CXX'] if 'LDSHARED' in os.environ: ldshared = os.environ['LDSHARED'] @@ -145,7 +107,7 @@ index 573724ddd7..0a04f33a86 100644 if 'AR' in os.environ: ar = os.environ['AR'] if 'ARFLAGS' in os.environ: -@@ -211,13 +222,17 @@ def customize_compiler(compiler): +@@ -208,13 +219,17 @@ def customize_compiler(compiler): archiver = ar + ' ' + ar_flags cc_cmd = cc + ' ' + cflags @@ -165,7 +127,7 @@ index 573724ddd7..0a04f33a86 100644 compiler.shared_lib_extension = shlib_suffix diff --git a/lib-python/3/distutils/sysconfig_pypy.py b/lib-python/3/distutils/sysconfig_pypy.py -index bf1748e300..70dfd72a1a 100644 +index bf1748e..70dfd72 100644 --- a/lib-python/3/distutils/sysconfig_pypy.py +++ b/lib-python/3/distutils/sysconfig_pypy.py @@ -145,36 +145,52 @@ def customize_compiler(compiler): @@ -247,7 +209,7 @@ index bf1748e300..70dfd72a1a 100644 compiler.shared_lib_extension = shlib_suffix diff --git a/lib-python/3/distutils/unixccompiler.py b/lib-python/3/distutils/unixccompiler.py -index 32030ed150..1db3d5498b 100644 +index 2944ceb..cf2f219 100644 --- a/lib-python/3/distutils/unixccompiler.py +++ b/lib-python/3/distutils/unixccompiler.py @@ -52,14 +52,17 @@ class UnixCCompiler(CCompiler): @@ -331,7 +293,7 @@ index 32030ed150..1db3d5498b 100644 if sys.platform == 'darwin': linker = _osx_support.compiler_fixup(linker, ld_args) diff --git a/lib_pypy/_sysconfigdata.py b/lib_pypy/_sysconfigdata.py -index 2ceafe80bf..ee3f802c41 100644 +index 4d2b0bc..5ed9641 100644 --- a/lib_pypy/_sysconfigdata.py +++ b/lib_pypy/_sysconfigdata.py @@ -15,6 +15,7 @@ build_time_vars = { @@ -342,6 +304,3 @@ index 2ceafe80bf..ee3f802c41 100644 'EXT_SUFFIX': so_ext, 'SHLIB_SUFFIX': ".so", 'AR': "ar", --- -2.20.1 - |