1 |
commit: efd41e5075867bed18fb89ea31f09cd9db1f918d |
2 |
Author: Michał Górny <mgorny <AT> gentoo <DOT> org> |
3 |
AuthorDate: Mon Dec 30 11:03:58 2019 +0000 |
4 |
Commit: Michał Górny <mgorny <AT> gentoo <DOT> org> |
5 |
CommitDate: Mon Dec 30 11:57:51 2019 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=efd41e50 |
7 |
|
8 |
dev-python/pypy-bin: Remove old |
9 |
|
10 |
Signed-off-by: Michał Górny <mgorny <AT> gentoo.org> |
11 |
|
12 |
dev-python/pypy-bin/Manifest | 6 - |
13 |
....UnixCCompiler.runtime_library_dir_option.patch | 11 - |
14 |
.../pypy-bin/files/5.8.0_all_distutils_cxx.patch | 388 --------------------- |
15 |
dev-python/pypy-bin/files/7.0.0-gentoo-path.patch | 52 --- |
16 |
dev-python/pypy-bin/pypy-bin-7.2.0.ebuild | 188 ---------- |
17 |
5 files changed, 645 deletions(-) |
18 |
|
19 |
diff --git a/dev-python/pypy-bin/Manifest b/dev-python/pypy-bin/Manifest |
20 |
deleted file mode 100644 |
21 |
index 4c6ea3a6d7e..00000000000 |
22 |
--- a/dev-python/pypy-bin/Manifest |
23 |
+++ /dev/null |
24 |
@@ -1,6 +0,0 @@ |
25 |
-DIST pypy-bin-7.2.0-amd64+bzip2+jit+ncurses.tar.lz 13208672 BLAKE2B 526e2f4eeb57d1f169344244384f3aa35d77bd0f9dc4e1f463248eeac023e7c98a21e565080d0cc3e56c1950128450b1fc6e830e33032e8267aa21c5beb4f80b SHA512 d49942d1cd97ab580850b95590cf0982eb7f53e0b88681408392266cdad814d00d195edd757b106e4016d8df9e0d3c53bf937de145f9257313f33ffb86c2229e |
26 |
-DIST pypy-bin-7.2.0-amd64+bzip2+ncurses.tar.lz 7865924 BLAKE2B 1d3cf776274285aee433de2dc8ebd5e0bf52a7cc700f1bbfb16ca071ac5b6017dddad211d9dcdf809f97289e12d38e5758023dbd80c6a68323ffaa02e8c72614 SHA512 ad481a62359c615a0fcb1bb3e57b84c536b43d569ac88393000bd8b9e9d0fc3e685c3907cfcf241c3dc60479589d042009ffe1382a27be2581c8ab421e7f0397 |
27 |
-DIST pypy-bin-7.2.0-x86+bzip2+jit+ncurses+sse2.tar.lz 9887935 BLAKE2B 177780ff596b1256f623982ba44ec2ec1c951e420a4521520ffee93e6e480864c59e8e55769f583841a0622693a578f84f408f6e577f97e7812ced7fb7594104 SHA512 dd0c71bff27beaef98ab0ce114108cd586863ef2d6eac999dbb0bdbef7cda1f5f568b465e803339a7b92262354bfe674cc6161ee1c0d479545c6d7bcd58ec3cd |
28 |
-DIST pypy-bin-7.2.0-x86+bzip2+ncurses+sse2.tar.lz 6092349 BLAKE2B e285f4c5443c356cba90c0e56dcf9ad75357613bcf486e80816d4304bc9459ba53250a58f09155382f6ebb624610780a9f77c312aeb55a28236474cedf994e26 SHA512 0a4d782f5b074cc5fb206cd2843a59ea59c3a17ac8fd8bf2c74f0997d906e5f722142f0d33a20cdb3a7c7eb476f3799a797d5c2ccac2632c425317d38cb54b7c |
29 |
-DIST pypy2.7-v7.2.0-src.tar.bz2 20219532 BLAKE2B 225e2cebdfa3ceb310f2a047b1d9e1d375b181c10707822890f39fc0a5ec9e6ddd7a8cf6e073074067960b766a0a813294042513a08b8e7e02b011f612e17917 SHA512 8f724490f9fa06686c8e25ddd3592b260bbffae460395de4c7d29d983780ce9b8925fa87434aac6446aac2034381cc1a13074faf252f5d1ac466a252f219f1ae |
30 |
-DIST python-gentoo-patches-2.7.15.tar.xz 16208 BLAKE2B 5739c2b3a236d48f8e33f0fe6515bfe7a8f99096f6223b402653988feac2513d37d26b6e40e5e049852f42657358170e468ca60097e0e2294e760787c12ad591 SHA512 687fd008d1d41b1e65ce5417f6f6aba84ffd42f7af44ef97c03a7806b28e6888f8df043a0c15187a8b229cc17642853e6feb25494db97f4d10f8a66f8ebcbcca |
31 |
|
32 |
diff --git a/dev-python/pypy-bin/files/1.9-distutils.unixccompiler.UnixCCompiler.runtime_library_dir_option.patch b/dev-python/pypy-bin/files/1.9-distutils.unixccompiler.UnixCCompiler.runtime_library_dir_option.patch |
33 |
deleted file mode 100644 |
34 |
index 65321bb60e6..00000000000 |
35 |
--- a/dev-python/pypy-bin/files/1.9-distutils.unixccompiler.UnixCCompiler.runtime_library_dir_option.patch |
36 |
+++ /dev/null |
37 |
@@ -1,11 +0,0 @@ |
38 |
---- a/lib-python/2.7/distutils/unixccompiler.py |
39 |
-+++ b/lib-python/2.7/distutils/unixccompiler.py |
40 |
-@@ -297,7 +297,7 @@ |
41 |
- # this time, there's no way to determine this information from |
42 |
- # the configuration data stored in the Python installation, so |
43 |
- # we use this hack. |
44 |
-- compiler = os.path.basename(sysconfig.get_config_var("CC")) |
45 |
-+ compiler = os.path.basename(self.compiler[0]) |
46 |
- if sys.platform[:6] == "darwin": |
47 |
- # MacOSX's linker doesn't understand the -R flag at all |
48 |
- return "-L" + dir |
49 |
|
50 |
diff --git a/dev-python/pypy-bin/files/5.8.0_all_distutils_cxx.patch b/dev-python/pypy-bin/files/5.8.0_all_distutils_cxx.patch |
51 |
deleted file mode 100644 |
52 |
index f0268e29695..00000000000 |
53 |
--- a/dev-python/pypy-bin/files/5.8.0_all_distutils_cxx.patch |
54 |
+++ /dev/null |
55 |
@@ -1,388 +0,0 @@ |
56 |
-From 9bf4611231faa0dc9ae64c6a7a8b55a3290a3ca2 Mon Sep 17 00:00:00 2001 |
57 |
-From: =?UTF-8?q?Micha=C5=82=20G=C3=B3rny?= <mgorny@g.o> |
58 |
-Date: Tue, 25 Apr 2017 07:14:11 +0200 |
59 |
-Subject: [PATCH] Fancy patch for distutils C++ support, rebased for pypy5.7 |
60 |
- |
61 |
-http://bugs.python.org/issue1222585 |
62 |
-http://bugs.gentoo.org/show_bug.cgi?id=599918 |
63 |
---- |
64 |
- _osx_support.py | 10 ++--- |
65 |
- distutils/cygwinccompiler.py | 21 ++++++++-- |
66 |
- distutils/emxccompiler.py | 14 +++++-- |
67 |
- distutils/sysconfig_cpython.py | 26 ++++++++++--- |
68 |
- distutils/sysconfig_pypy.py | 37 ++++++++++++++---- |
69 |
- distutils/unixccompiler.py | 55 ++++++++++++++------------- |
70 |
- 6 files changed, 112 insertions(+), 51 deletions(-) |
71 |
- |
72 |
-diff --git a/_osx_support.py b/_osx_support.py |
73 |
-index d2aaae7..8bcdb05 100644 |
74 |
---- a/_osx_support.py |
75 |
-+++ b/_osx_support.py |
76 |
-@@ -14,13 +14,13 @@ __all__ = [ |
77 |
- # configuration variables that may contain universal build flags, |
78 |
- # like "-arch" or "-isdkroot", that may need customization for |
79 |
- # the user environment |
80 |
--_UNIVERSAL_CONFIG_VARS = ('CFLAGS', 'LDFLAGS', 'CPPFLAGS', 'BASECFLAGS', |
81 |
-- 'BLDSHARED', 'LDSHARED', 'CC', 'CXX', |
82 |
-- 'PY_CFLAGS', 'PY_LDFLAGS', 'PY_CPPFLAGS', |
83 |
-- 'PY_CORE_CFLAGS') |
84 |
-+_UNIVERSAL_CONFIG_VARS = ('CFLAGS', 'CXXFLAGS', 'LDFLAGS', 'CPPFLAGS', |
85 |
-+ 'BASECFLAGS', 'BLDSHARED', 'LDSHARED', 'LDCXXSHARED', |
86 |
-+ 'CC', 'CXX', 'PY_CFLAGS', 'PY_LDFLAGS', |
87 |
-+ 'PY_CPPFLAGS', 'PY_CORE_CFLAGS') |
88 |
- |
89 |
- # configuration variables that may contain compiler calls |
90 |
--_COMPILER_CONFIG_VARS = ('BLDSHARED', 'LDSHARED', 'CC', 'CXX') |
91 |
-+_COMPILER_CONFIG_VARS = ('BLDSHARED', 'LDSHARED', 'LDCXXSHARED', 'CC', 'CXX') |
92 |
- |
93 |
- # prefix added to original configuration variable names |
94 |
- _INITPRE = '_OSX_SUPPORT_INITIAL_' |
95 |
-diff --git a/distutils/cygwinccompiler.py b/distutils/cygwinccompiler.py |
96 |
-index 767400c..7133097 100644 |
97 |
---- a/distutils/cygwinccompiler.py |
98 |
-+++ b/distutils/cygwinccompiler.py |
99 |
-@@ -120,8 +120,10 @@ class CygwinCCompiler (UnixCCompiler): |
100 |
- # dllwrap 2.10.90 is buggy |
101 |
- if self.ld_version >= "2.10.90": |
102 |
- self.linker_dll = "gcc" |
103 |
-+ self.linker_dll_cxx = "g++" |
104 |
- else: |
105 |
- self.linker_dll = "dllwrap" |
106 |
-+ self.linker_dll_cxx = "dllwrap" |
107 |
- |
108 |
- # ld_version >= "2.13" support -shared so use it instead of |
109 |
- # -mdll -static |
110 |
-@@ -135,9 +137,13 @@ class CygwinCCompiler (UnixCCompiler): |
111 |
- self.set_executables(compiler='gcc -mcygwin -O -Wall', |
112 |
- compiler_so='gcc -mcygwin -mdll -O -Wall', |
113 |
- compiler_cxx='g++ -mcygwin -O -Wall', |
114 |
-+ compiler_so_cxx='g++ -mcygwin -mdll -O -Wall', |
115 |
- linker_exe='gcc -mcygwin', |
116 |
- linker_so=('%s -mcygwin %s' % |
117 |
-- (self.linker_dll, shared_option))) |
118 |
-+ (self.linker_dll, shared_option)), |
119 |
-+ linker_exe_cxx='g++ -mcygwin', |
120 |
-+ linker_so_cxx=('%s -mcygwin %s' % |
121 |
-+ (self.linker_dll_cxx, shared_option))) |
122 |
- |
123 |
- # cygwin and mingw32 need different sets of libraries |
124 |
- if self.gcc_version == "2.91.57": |
125 |
-@@ -163,8 +169,12 @@ class CygwinCCompiler (UnixCCompiler): |
126 |
- raise CompileError, msg |
127 |
- else: # for other files use the C-compiler |
128 |
- try: |
129 |
-- self.spawn(self.compiler_so + cc_args + [src, '-o', obj] + |
130 |
-- extra_postargs) |
131 |
-+ if self.detect_language(src) == 'c++': |
132 |
-+ self.spawn(self.compiler_so_cxx + cc_args + [src, '-o', obj] + |
133 |
-+ extra_postargs) |
134 |
-+ else: |
135 |
-+ self.spawn(self.compiler_so + cc_args + [src, '-o', obj] + |
136 |
-+ extra_postargs) |
137 |
- except DistutilsExecError, msg: |
138 |
- raise CompileError, msg |
139 |
- |
140 |
-@@ -330,9 +340,14 @@ class Mingw32CCompiler (CygwinCCompiler): |
141 |
- self.set_executables(compiler='gcc%s -O -Wall' % no_cygwin, |
142 |
- compiler_so='gcc%s -mdll -O -Wall' % no_cygwin, |
143 |
- compiler_cxx='g++%s -O -Wall' % no_cygwin, |
144 |
-+ compiler_so_cxx='g++%s -mdll -O -Wall' % no_cygwin, |
145 |
- linker_exe='gcc%s' % no_cygwin, |
146 |
- linker_so='%s%s %s %s' |
147 |
- % (self.linker_dll, no_cygwin, |
148 |
-+ shared_option, entry_point), |
149 |
-+ linker_exe_cxx='g++%s' % no_cygwin, |
150 |
-+ linker_so_cxx='%s%s %s %s' |
151 |
-+ % (self.linker_dll_cxx, no_cygwin, |
152 |
- shared_option, entry_point)) |
153 |
- # Maybe we should also append -mthreads, but then the finished |
154 |
- # dlls need another dll (mingwm10.dll see Mingw32 docs) |
155 |
-diff --git a/distutils/emxccompiler.py b/distutils/emxccompiler.py |
156 |
-index a017205..bdc532c 100644 |
157 |
---- a/distutils/emxccompiler.py |
158 |
-+++ b/distutils/emxccompiler.py |
159 |
-@@ -65,8 +65,12 @@ class EMXCCompiler (UnixCCompiler): |
160 |
- # XXX optimization, warnings etc. should be customizable. |
161 |
- self.set_executables(compiler='gcc -Zomf -Zmt -O3 -fomit-frame-pointer -mprobe -Wall', |
162 |
- compiler_so='gcc -Zomf -Zmt -O3 -fomit-frame-pointer -mprobe -Wall', |
163 |
-+ compiler_cxx='g++ -Zomf -Zmt -O3 -fomit-frame-pointer -mprobe -Wall', |
164 |
-+ compiler_so_cxx='g++ -Zomf -Zmt -O3 -fomit-frame-pointer -mprobe -Wall', |
165 |
- linker_exe='gcc -Zomf -Zmt -Zcrtdll', |
166 |
-- linker_so='gcc -Zomf -Zmt -Zcrtdll -Zdll') |
167 |
-+ linker_so='gcc -Zomf -Zmt -Zcrtdll -Zdll', |
168 |
-+ linker_exe_cxx='g++ -Zomf -Zmt -Zcrtdll', |
169 |
-+ linker_so_cxx='g++ -Zomf -Zmt -Zcrtdll -Zdll') |
170 |
- |
171 |
- # want the gcc library statically linked (so that we don't have |
172 |
- # to distribute a version dependent on the compiler we have) |
173 |
-@@ -83,8 +87,12 @@ class EMXCCompiler (UnixCCompiler): |
174 |
- raise CompileError, msg |
175 |
- else: # for other files use the C-compiler |
176 |
- try: |
177 |
-- self.spawn(self.compiler_so + cc_args + [src, '-o', obj] + |
178 |
-- extra_postargs) |
179 |
-+ if self.detect_language(src) == 'c++': |
180 |
-+ self.spawn(self.compiler_so_cxx + cc_args + [src, '-o', obj] + |
181 |
-+ extra_postargs) |
182 |
-+ else: |
183 |
-+ self.spawn(self.compiler_so + cc_args + [src, '-o', obj] + |
184 |
-+ extra_postargs) |
185 |
- except DistutilsExecError, msg: |
186 |
- raise CompileError, msg |
187 |
- |
188 |
-diff --git a/distutils/sysconfig_cpython.py b/distutils/sysconfig_cpython.py |
189 |
-index 35f39e4..8dd032d 100644 |
190 |
---- a/distutils/sysconfig_cpython.py |
191 |
-+++ b/distutils/sysconfig_cpython.py |
192 |
-@@ -171,10 +171,12 @@ def customize_compiler(compiler): |
193 |
- _osx_support.customize_compiler(_config_vars) |
194 |
- _config_vars['CUSTOMIZED_OSX_COMPILER'] = 'True' |
195 |
- |
196 |
-- (cc, cxx, opt, cflags, ccshared, ldshared, so_ext, ar, ar_flags) = \ |
197 |
-- get_config_vars('CC', 'CXX', 'OPT', 'CFLAGS', |
198 |
-- 'CCSHARED', 'LDSHARED', 'SO', 'AR', |
199 |
-- 'ARFLAGS') |
200 |
-+ (cc, cxx, ccshared, ldshared, ldcxxshared, so_ext, ar, ar_flags) = \ |
201 |
-+ get_config_vars('CC', 'CXX', 'CCSHARED', 'LDSHARED', 'LDCXXSHARED', |
202 |
-+ 'SO', 'AR', 'ARFLAGS') |
203 |
-+ |
204 |
-+ cflags = '' |
205 |
-+ cxxflags = '' |
206 |
- |
207 |
- if 'CC' in os.environ: |
208 |
- newcc = os.environ['CC'] |
209 |
-@@ -189,19 +191,27 @@ def customize_compiler(compiler): |
210 |
- cxx = os.environ['CXX'] |
211 |
- if 'LDSHARED' in os.environ: |
212 |
- ldshared = os.environ['LDSHARED'] |
213 |
-+ if 'LDCXXSHARED' in os.environ: |
214 |
-+ ldcxxshared = os.environ['LDCXXSHARED'] |
215 |
- if 'CPP' in os.environ: |
216 |
- cpp = os.environ['CPP'] |
217 |
- else: |
218 |
- cpp = cc + " -E" # not always |
219 |
- if 'LDFLAGS' in os.environ: |
220 |
- ldshared = ldshared + ' ' + os.environ['LDFLAGS'] |
221 |
-+ ldcxxshared = ldcxxshared + ' ' + os.environ['LDFLAGS'] |
222 |
- if 'CFLAGS' in os.environ: |
223 |
-- cflags = opt + ' ' + os.environ['CFLAGS'] |
224 |
-+ cflags = os.environ['CFLAGS'] |
225 |
- ldshared = ldshared + ' ' + os.environ['CFLAGS'] |
226 |
-+ if 'CXXFLAGS' in os.environ: |
227 |
-+ cxxflags = os.environ['CXXFLAGS'] |
228 |
-+ ldcxxshared = ldcxxshared + ' ' + os.environ['CXXFLAGS'] |
229 |
- if 'CPPFLAGS' in os.environ: |
230 |
- cpp = cpp + ' ' + os.environ['CPPFLAGS'] |
231 |
- cflags = cflags + ' ' + os.environ['CPPFLAGS'] |
232 |
-+ cxxflags = cxxflags + ' ' + os.environ['CPPFLAGS'] |
233 |
- ldshared = ldshared + ' ' + os.environ['CPPFLAGS'] |
234 |
-+ ldcxxshared = ldcxxshared + ' ' + os.environ['CPPFLAGS'] |
235 |
- if 'AR' in os.environ: |
236 |
- ar = os.environ['AR'] |
237 |
- if 'ARFLAGS' in os.environ: |
238 |
-@@ -210,13 +220,17 @@ def customize_compiler(compiler): |
239 |
- archiver = ar + ' ' + ar_flags |
240 |
- |
241 |
- cc_cmd = cc + ' ' + cflags |
242 |
-+ cxx_cmd = cxx + ' ' + cxxflags |
243 |
- compiler.set_executables( |
244 |
- preprocessor=cpp, |
245 |
- compiler=cc_cmd, |
246 |
- compiler_so=cc_cmd + ' ' + ccshared, |
247 |
-- compiler_cxx=cxx, |
248 |
-+ compiler_cxx=cxx_cmd, |
249 |
-+ compiler_so_cxx=cxx_cmd + ' ' + ccshared, |
250 |
- linker_so=ldshared, |
251 |
- linker_exe=cc, |
252 |
-+ linker_so_cxx=ldcxxshared, |
253 |
-+ linker_exe_cxx=cxx, |
254 |
- archiver=archiver) |
255 |
- |
256 |
- compiler.shared_lib_extension = so_ext |
257 |
-diff --git a/distutils/sysconfig_pypy.py b/distutils/sysconfig_pypy.py |
258 |
-index 368f232..4fe1f08 100644 |
259 |
---- a/distutils/sysconfig_pypy.py |
260 |
-+++ b/distutils/sysconfig_pypy.py |
261 |
-@@ -67,6 +67,7 @@ def _init_posix(): |
262 |
- g['CFLAGS'] = "-DNDEBUG -O2" |
263 |
- g['CCSHARED'] = "-fPIC" |
264 |
- g['LDSHARED'] = "cc -pthread -shared" |
265 |
-+ g['LDCXXSHARED'] = "c++ -pthread -shared" |
266 |
- g['SO'] = [s[0] for s in imp.get_suffixes() if s[2] == imp.C_EXTENSION][0] |
267 |
- g['AR'] = "ar" |
268 |
- g['ARFLAGS'] = "rc" |
269 |
-@@ -85,6 +86,7 @@ def _init_posix(): |
270 |
- # just a guess |
271 |
- arch = platform.machine() |
272 |
- g['LDSHARED'] += ' -undefined dynamic_lookup' |
273 |
-+ g['LDCXXSHARED'] += ' -undefined dynamic_lookup' |
274 |
- g['CC'] += ' -arch %s' % (arch,) |
275 |
- |
276 |
- global _config_vars |
277 |
-@@ -168,37 +170,52 @@ def customize_compiler(compiler): |
278 |
- _osx_support.customize_compiler(_config_vars) |
279 |
- _config_vars['CUSTOMIZED_OSX_COMPILER'] = 'True' |
280 |
- |
281 |
-- (cc, cxx, opt, cflags, ccshared, ldshared, so_ext, ar, ar_flags) = \ |
282 |
-- get_config_vars('CC', 'CXX', 'OPT', 'CFLAGS', |
283 |
-- 'CCSHARED', 'LDSHARED', 'SO', 'AR', |
284 |
-- 'ARFLAGS') |
285 |
-+ (cc, cxx, ccshared, ldshared, ldcxxshared, so_ext, ar, ar_flags) = \ |
286 |
-+ get_config_vars('CC', 'CXX', 'CCSHARED', 'LDSHARED', 'LDCXXSHARED', |
287 |
-+ 'SO', 'AR', 'ARFLAGS') |
288 |
-+ |
289 |
-+ cflags = '' |
290 |
-+ cxxflags = '' |
291 |
- |
292 |
- if 'CC' in os.environ: |
293 |
- newcc = os.environ['CC'] |
294 |
-- if (sys.platform == 'darwin' |
295 |
-+ if (True |
296 |
- and 'LDSHARED' not in os.environ |
297 |
- and ldshared.startswith(cc)): |
298 |
- # On OS X, if CC is overridden, use that as the default |
299 |
- # command for LDSHARED as well |
300 |
-+ # Gentoo: s/OS X/every system/ |
301 |
- ldshared = newcc + ldshared[len(cc):] |
302 |
- cc = newcc |
303 |
- if 'CXX' in os.environ: |
304 |
-- cxx = os.environ['CXX'] |
305 |
-+ newcxx = os.environ['CXX'] |
306 |
-+ if ('LDCXXSHARED' not in os.environ |
307 |
-+ and ldcxxshared.startswith(cxx)): |
308 |
-+ ldcxxshared = newcxx + ldcxxshared[len(cxx):] |
309 |
-+ cxx = newcxx |
310 |
- if 'LDSHARED' in os.environ: |
311 |
- ldshared = os.environ['LDSHARED'] |
312 |
-+ if 'LDCXXSHARED' in os.environ: |
313 |
-+ ldcxxshared = os.environ['LDCXXSHARED'] |
314 |
- if 'CPP' in os.environ: |
315 |
- cpp = os.environ['CPP'] |
316 |
- else: |
317 |
- cpp = cc + " -E" # not always |
318 |
- if 'LDFLAGS' in os.environ: |
319 |
- ldshared = ldshared + ' ' + os.environ['LDFLAGS'] |
320 |
-+ ldcxxshared = ldcxxshared + ' ' + os.environ['LDFLAGS'] |
321 |
- if 'CFLAGS' in os.environ: |
322 |
-- cflags = opt + ' ' + os.environ['CFLAGS'] |
323 |
-+ cflags = os.environ['CFLAGS'] |
324 |
- ldshared = ldshared + ' ' + os.environ['CFLAGS'] |
325 |
-+ if 'CXXFLAGS' in os.environ: |
326 |
-+ cxxflags = os.environ['CXXFLAGS'] |
327 |
-+ ldcxxshared = ldcxxshared + ' ' + os.environ['CXXFLAGS'] |
328 |
- if 'CPPFLAGS' in os.environ: |
329 |
- cpp = cpp + ' ' + os.environ['CPPFLAGS'] |
330 |
- cflags = cflags + ' ' + os.environ['CPPFLAGS'] |
331 |
-+ cxxflags = cxxflags + ' ' + os.environ['CPPFLAGS'] |
332 |
- ldshared = ldshared + ' ' + os.environ['CPPFLAGS'] |
333 |
-+ ldcxxshared = ldcxxshared + ' ' + os.environ['CPPFLAGS'] |
334 |
- if 'AR' in os.environ: |
335 |
- ar = os.environ['AR'] |
336 |
- if 'ARFLAGS' in os.environ: |
337 |
-@@ -207,13 +224,17 @@ def customize_compiler(compiler): |
338 |
- archiver = ar + ' ' + ar_flags |
339 |
- |
340 |
- cc_cmd = cc + ' ' + cflags |
341 |
-+ cxx_cmd = cxx + ' ' + cxxflags |
342 |
- compiler.set_executables( |
343 |
- preprocessor=cpp, |
344 |
- compiler=cc_cmd, |
345 |
- compiler_so=cc_cmd + ' ' + ccshared, |
346 |
-- compiler_cxx=cxx, |
347 |
-+ compiler_cxx=cxx_cmd, |
348 |
-+ compiler_so_cxx=cxx_cmd + ' ' + ccshared, |
349 |
- linker_so=ldshared, |
350 |
- linker_exe=cc, |
351 |
-+ linker_so_cxx=ldcxxshared, |
352 |
-+ linker_exe_cxx=cxx, |
353 |
- archiver=archiver) |
354 |
- |
355 |
- compiler.shared_lib_extension = so_ext |
356 |
-diff --git a/distutils/unixccompiler.py b/distutils/unixccompiler.py |
357 |
-index dee88a5..558b568 100644 |
358 |
---- a/distutils/unixccompiler.py |
359 |
-+++ b/distutils/unixccompiler.py |
360 |
-@@ -55,14 +55,17 @@ class UnixCCompiler(CCompiler): |
361 |
- # are pretty generic; they will probably have to be set by an outsider |
362 |
- # (eg. using information discovered by the sysconfig about building |
363 |
- # Python extensions). |
364 |
-- executables = {'preprocessor' : None, |
365 |
-- 'compiler' : ["cc"], |
366 |
-- 'compiler_so' : ["cc"], |
367 |
-- 'compiler_cxx' : ["c++"], # pypy: changed, 'cc' is bogus |
368 |
-- 'linker_so' : ["cc", "-shared"], |
369 |
-- 'linker_exe' : ["cc"], |
370 |
-- 'archiver' : ["ar", "-cr"], |
371 |
-- 'ranlib' : None, |
372 |
-+ executables = {'preprocessor' : None, |
373 |
-+ 'compiler' : ["cc"], |
374 |
-+ 'compiler_so' : ["cc"], |
375 |
-+ 'compiler_cxx' : ["c++"], |
376 |
-+ 'compiler_so_cxx' : ["c++"], |
377 |
-+ 'linker_so' : ["cc", "-shared"], |
378 |
-+ 'linker_exe' : ["cc"], |
379 |
-+ 'linker_so_cxx' : ["c++", "-shared"], |
380 |
-+ 'linker_exe_cxx' : ["c++"], |
381 |
-+ 'archiver' : ["ar", "-cr"], |
382 |
-+ 'ranlib' : None, |
383 |
- } |
384 |
- |
385 |
- if sys.platform[:6] == "darwin": |
386 |
-@@ -129,12 +132,19 @@ class UnixCCompiler(CCompiler): |
387 |
- |
388 |
- def _compile(self, obj, src, ext, cc_args, extra_postargs, pp_opts): |
389 |
- compiler_so = self.compiler_so |
390 |
-+ compiler_so_cxx = self.compiler_so_cxx |
391 |
- if sys.platform == 'darwin': |
392 |
- compiler_so = _osx_support.compiler_fixup(compiler_so, |
393 |
- cc_args + extra_postargs) |
394 |
-+ compiler_so_cxx = _osx_support.compiler_fixup(compiler_so_cxx, |
395 |
-+ cc_args + extra_postargs) |
396 |
- try: |
397 |
-- self.spawn(compiler_so + cc_args + [src, '-o', obj] + |
398 |
-- extra_postargs) |
399 |
-+ if self.detect_language(src) == 'c++': |
400 |
-+ self.spawn(compiler_so_cxx + cc_args + [src, '-o', obj] + |
401 |
-+ extra_postargs) |
402 |
-+ else: |
403 |
-+ self.spawn(compiler_so + cc_args + [src, '-o', obj] + |
404 |
-+ extra_postargs) |
405 |
- except DistutilsExecError, msg: |
406 |
- raise CompileError, msg |
407 |
- |
408 |
-@@ -191,23 +201,16 @@ class UnixCCompiler(CCompiler): |
409 |
- ld_args.extend(extra_postargs) |
410 |
- self.mkpath(os.path.dirname(output_filename)) |
411 |
- try: |
412 |
-- if target_desc == CCompiler.EXECUTABLE: |
413 |
-- linker = self.linker_exe[:] |
414 |
-+ if target_lang == "c++": |
415 |
-+ if target_desc == CCompiler.EXECUTABLE: |
416 |
-+ linker = self.linker_exe_cxx[:] |
417 |
-+ else: |
418 |
-+ linker = self.linker_so_cxx[:] |
419 |
- else: |
420 |
-- linker = self.linker_so[:] |
421 |
-- if target_lang == "c++" and self.compiler_cxx: |
422 |
-- # skip over environment variable settings if /usr/bin/env |
423 |
-- # is used to set up the linker's environment. |
424 |
-- # This is needed on OSX. Note: this assumes that the |
425 |
-- # normal and C++ compiler have the same environment |
426 |
-- # settings. |
427 |
-- i = 0 |
428 |
-- if os.path.basename(linker[0]) == "env": |
429 |
-- i = 1 |
430 |
-- while '=' in linker[i]: |
431 |
-- i = i + 1 |
432 |
-- |
433 |
-- linker[i] = self.compiler_cxx[i] |
434 |
-+ if target_desc == CCompiler.EXECUTABLE: |
435 |
-+ linker = self.linker_exe[:] |
436 |
-+ else: |
437 |
-+ linker = self.linker_so[:] |
438 |
- |
439 |
- if sys.platform == 'darwin': |
440 |
- linker = _osx_support.compiler_fixup(linker, ld_args) |
441 |
--- |
442 |
-2.12.2 |
443 |
- |
444 |
|
445 |
diff --git a/dev-python/pypy-bin/files/7.0.0-gentoo-path.patch b/dev-python/pypy-bin/files/7.0.0-gentoo-path.patch |
446 |
deleted file mode 100644 |
447 |
index 9be52cd0b75..00000000000 |
448 |
--- a/dev-python/pypy-bin/files/7.0.0-gentoo-path.patch |
449 |
+++ /dev/null |
450 |
@@ -1,52 +0,0 @@ |
451 |
-From 959e2aafbe6cabd4e6860f842bce9b8644f627ca Mon Sep 17 00:00:00 2001 |
452 |
-From: =?UTF-8?q?Micha=C5=82=20G=C3=B3rny?= <mgorny@g.o> |
453 |
-Date: Fri, 27 Nov 2015 17:02:42 +0100 |
454 |
-Subject: [PATCH] Gentoo: override paths for system-wide install based on |
455 |
- sys.prefix |
456 |
- |
457 |
-Override all default distutils install paths to ones suitable for |
458 |
-system-wide install when sys.prefix indicates we're running the Gentoo |
459 |
-system-wide install of PyPy with no prefix overrides (e.g. virtualenv). |
460 |
- |
461 |
-Fixes: https://bugs.gentoo.org/462306 |
462 |
-Fixes: https://bugs.gentoo.org/465546 |
463 |
- |
464 |
-[updated for 7.0.0] |
465 |
---- |
466 |
- lib-python/2.7/distutils/command/install.py | 13 ++++++++++++- |
467 |
- 1 file changed, 12 insertions(+), 1 deletion(-) |
468 |
- |
469 |
-diff --git a/lib-python/2.7/distutils/command/install.py b/lib-python/2.7/distutils/command/install.py |
470 |
-index fc43951da0..c2564188cb 100644 |
471 |
---- a/lib-python/2.7/distutils/command/install.py |
472 |
-+++ b/lib-python/2.7/distutils/command/install.py |
473 |
-@@ -90,6 +90,13 @@ INSTALL_SCHEMES = { |
474 |
- 'scripts': '$base/bin', |
475 |
- 'data' : '$base', |
476 |
- }, |
477 |
-+ 'gentoo': { |
478 |
-+ 'purelib': '$base/site-packages', |
479 |
-+ 'platlib': '$base/site-packages', |
480 |
-+ 'headers': '$base/include', |
481 |
-+ 'scripts': '@EPREFIX@/usr/bin', |
482 |
-+ 'data' : '@EPREFIX@/usr', |
483 |
-+ }, |
484 |
- } |
485 |
- |
486 |
- # The keys to an installation scheme; if any new types of files are to be |
487 |
-@@ -476,7 +483,11 @@ class install (Command): |
488 |
- # it's the caller's problem if they supply a bad name! |
489 |
- if (hasattr(sys, 'pypy_version_info') and |
490 |
- not name.endswith(('_user', '_home'))): |
491 |
-- name = 'pypy' |
492 |
-+ if self.install_base == os.path.normpath('@EPREFIX@/usr/lib/pypy2.7'): |
493 |
-+ # override paths for system-wide install |
494 |
-+ name = 'gentoo' |
495 |
-+ else: |
496 |
-+ name = 'pypy' |
497 |
- scheme = INSTALL_SCHEMES[name] |
498 |
- for key in SCHEME_KEYS: |
499 |
- attrname = 'install_' + key |
500 |
--- |
501 |
-2.21.0.rc1 |
502 |
- |
503 |
|
504 |
diff --git a/dev-python/pypy-bin/pypy-bin-7.2.0.ebuild b/dev-python/pypy-bin/pypy-bin-7.2.0.ebuild |
505 |
deleted file mode 100644 |
506 |
index 45eeb5eebb3..00000000000 |
507 |
--- a/dev-python/pypy-bin/pypy-bin-7.2.0.ebuild |
508 |
+++ /dev/null |
509 |
@@ -1,188 +0,0 @@ |
510 |
-# Copyright 1999-2019 Gentoo Authors |
511 |
-# Distributed under the terms of the GNU General Public License v2 |
512 |
- |
513 |
-EAPI=7 |
514 |
- |
515 |
-inherit pax-utils python-utils-r1 unpacker |
516 |
- |
517 |
-BINHOST="https://dev.gentoo.org/~mgorny/dist/pypy-bin/${PV}" |
518 |
-CPY_PATCHSET_VERSION="2.7.15" |
519 |
-MY_P=pypy2.7-v${PV} |
520 |
- |
521 |
-DESCRIPTION="Pre-built version of PyPy" |
522 |
-HOMEPAGE="https://pypy.org/" |
523 |
-SRC_URI="https://bitbucket.org/pypy/pypy/downloads/${MY_P}-src.tar.bz2 |
524 |
- https://dev.gentoo.org/~floppym/python/python-gentoo-patches-${CPY_PATCHSET_VERSION}.tar.xz |
525 |
- amd64? ( |
526 |
- jit? ( ${BINHOST}/${P}-amd64+bzip2+jit+ncurses.tar.lz ) |
527 |
- !jit? ( ${BINHOST}/${P}-amd64+bzip2+ncurses.tar.lz ) |
528 |
- ) |
529 |
- x86? ( |
530 |
- cpu_flags_x86_sse2? ( |
531 |
- jit? ( ${BINHOST}/${P}-x86+bzip2+jit+ncurses+sse2.tar.lz ) |
532 |
- !jit? ( ${BINHOST}/${P}-x86+bzip2+ncurses+sse2.tar.lz ) |
533 |
- ) |
534 |
- )" |
535 |
- |
536 |
-LICENSE="MIT" |
537 |
-# pypy -c 'import sysconfig; print sysconfig.get_config_var("SOABI")' |
538 |
-# pypy 7.0.0: install directory changed to 'pypy2.7' |
539 |
-SLOT="0/41-py27" |
540 |
-KEYWORDS="~amd64 ~x86" |
541 |
-IUSE="gdbm +jit libressl sqlite cpu_flags_x86_sse2 tk" |
542 |
-# Supported variants |
543 |
-REQUIRED_USE="x86? ( cpu_flags_x86_sse2 )" |
544 |
- |
545 |
-RDEPEND=" |
546 |
- app-arch/bzip2:0/1 |
547 |
- dev-libs/expat:0/0 |
548 |
- dev-libs/libffi:0/7 |
549 |
- sys-devel/gcc:* |
550 |
- >=sys-libs/glibc-2.28 |
551 |
- sys-libs/ncurses:0/6 |
552 |
- sys-libs/zlib:0/1 |
553 |
- gdbm? ( sys-libs/gdbm:0= ) |
554 |
- !libressl? ( dev-libs/openssl:0= ) |
555 |
- libressl? ( dev-libs/libressl:0= ) |
556 |
- sqlite? ( dev-db/sqlite:3= ) |
557 |
- tk? ( |
558 |
- dev-lang/tk:0= |
559 |
- dev-tcltk/tix:0= |
560 |
- ) |
561 |
- !dev-python/pypy:0" |
562 |
-DEPEND="${RDEPEND} |
563 |
- app-arch/lzip |
564 |
- app-arch/xz-utils" |
565 |
- |
566 |
-S=${WORKDIR}/${MY_P}-src |
567 |
- |
568 |
-QA_PREBUILT=" |
569 |
- usr/lib/pypy2.7/pypy-c |
570 |
- usr/lib/pypy2.7/libpypy-c.so" |
571 |
- |
572 |
-src_prepare() { |
573 |
- eapply "${FILESDIR}/7.0.0-gentoo-path.patch" |
574 |
- eapply "${FILESDIR}/1.9-distutils.unixccompiler.UnixCCompiler.runtime_library_dir_option.patch" |
575 |
- |
576 |
- sed -e "s^@EPREFIX@^${EPREFIX}^" \ |
577 |
- -i lib-python/2.7/distutils/command/install.py || die |
578 |
- |
579 |
- # apply CPython stdlib patches |
580 |
- pushd lib-python/2.7 > /dev/null || die |
581 |
- # TODO: cpy turkish locale patch now fixes C code |
582 |
- # probably needs better port to pypy, if it is broken there |
583 |
- eapply "${FILESDIR}"/5.8.0_all_distutils_cxx.patch |
584 |
- eapply -p2 "${WORKDIR}"/patches/0011-use_pyxml.patch |
585 |
- popd > /dev/null || die |
586 |
- |
587 |
- eapply_user |
588 |
-} |
589 |
- |
590 |
-src_compile() { |
591 |
- # Tadaam! PyPy compiled! |
592 |
- mv "${WORKDIR}"/${P}*/{libpypy-c.so,pypy-c} . || die |
593 |
- mv "${WORKDIR}"/${P}*/include/*.h include/ || die |
594 |
- # (not installed by pypy) |
595 |
- rm pypy/module/cpyext/include/_numpypy/numpy/README || die |
596 |
- mv pypy/module/cpyext/include/* include/ || die |
597 |
- mv pypy/module/cpyext/parse/*.h include/ || die |
598 |
- |
599 |
- pax-mark m pypy-c libpypy-c.so |
600 |
- |
601 |
- einfo "Generating caches and CFFI modules ..." |
602 |
- |
603 |
- # Generate Grammar and PatternGrammar pickles. |
604 |
- ./pypy-c -c "import lib2to3.pygram, lib2to3.patcomp; lib2to3.patcomp.PatternCompiler()" \ |
605 |
- || die "Generation of Grammar and PatternGrammar pickles failed" |
606 |
- |
607 |
- # Generate cffi modules |
608 |
- # Please keep in sync with pypy/tool/build_cffi_imports.py! |
609 |
-#cffi_build_scripts = { |
610 |
-# "_ssl": "_ssl_build.py", |
611 |
-# "sqlite3": "_sqlite3_build.py", |
612 |
-# "audioop": "_audioop_build.py", |
613 |
-# "tk": "_tkinter/tklib_build.py", |
614 |
-# "curses": "_curses_build.py" if sys.platform != "win32" else None, |
615 |
-# "syslog": "_syslog_build.py" if sys.platform != "win32" else None, |
616 |
-# "gdbm": "_gdbm_build.py" if sys.platform != "win32" else None, |
617 |
-# "pwdgrp": "_pwdgrp_build.py" if sys.platform != "win32" else None, |
618 |
-# "resource": "_resource_build.py" if sys.platform != "win32" else None, |
619 |
- cffi_targets=( ssl audioop curses syslog pwdgrp resource ) |
620 |
- use gdbm && cffi_targets+=( gdbm ) |
621 |
- use sqlite && cffi_targets+=( sqlite3 ) |
622 |
- use tk && cffi_targets+=( tkinter/tklib ) |
623 |
- |
624 |
- local t |
625 |
- # all modules except tkinter output to . |
626 |
- # tkinter outputs to the correct dir ... |
627 |
- cd lib_pypy || die |
628 |
- for t in "${cffi_targets[@]}"; do |
629 |
- # tkinter doesn't work via -m |
630 |
- ../pypy-c "_${t}_build.py" || die "Failed to build CFFI bindings for ${t}" |
631 |
- done |
632 |
- |
633 |
- # Cleanup temporary objects |
634 |
- find -name "_cffi_*.[co]" -delete || die |
635 |
- find -type d -empty -delete || die |
636 |
-} |
637 |
- |
638 |
-src_test() { |
639 |
- # (unset) |
640 |
- local -x PYTHONDONTWRITEBYTECODE= |
641 |
- |
642 |
- local ignored_tests=( |
643 |
- # network |
644 |
- --ignore=lib-python/2.7/test/test_urllibnet.py |
645 |
- --ignore=lib-python/2.7/test/test_urllib2net.py |
646 |
- # lots of free space |
647 |
- --ignore=lib-python/2.7/test/test_zipfile64.py |
648 |
- # no module named 'worker' -- a lot |
649 |
- --ignore=lib-python/2.7/test/test_xpickle.py |
650 |
- ) |
651 |
- |
652 |
- ./pypy-c ./pypy/test_all.py --pypy=./pypy-c -vv \ |
653 |
- "${ignored_tests[@]}" lib-python || die |
654 |
-} |
655 |
- |
656 |
-src_install() { |
657 |
- local dest=/usr/lib/pypy2.7 |
658 |
- einfo "Installing PyPy ..." |
659 |
- exeinto "${dest}" |
660 |
- doexe pypy-c libpypy-c.so |
661 |
- pax-mark m "${ED}${dest}/pypy-c" "${ED}${dest}/libpypy-c.so" |
662 |
- insinto "${dest}" |
663 |
- # preserve mtimes to avoid obsoleting caches |
664 |
- insopts -p |
665 |
- doins -r include lib_pypy lib-python |
666 |
- dosym ../lib/pypy2.7/pypy-c /usr/bin/pypy |
667 |
- dodoc README.rst |
668 |
- |
669 |
- if ! use gdbm; then |
670 |
- rm -r "${ED}${dest}"/lib_pypy/gdbm.py \ |
671 |
- "${ED}${dest}"/lib-python/*2.7/test/test_gdbm.py || die |
672 |
- fi |
673 |
- if ! use sqlite; then |
674 |
- rm -r "${ED}${dest}"/lib-python/*2.7/sqlite3 \ |
675 |
- "${ED}${dest}"/lib_pypy/_sqlite3.py \ |
676 |
- "${ED}${dest}"/lib-python/*2.7/test/test_sqlite.py || die |
677 |
- fi |
678 |
- if ! use tk; then |
679 |
- rm -r "${ED}${dest}"/lib-python/*2.7/{idlelib,lib-tk} \ |
680 |
- "${ED}${dest}"/lib_pypy/_tkinter \ |
681 |
- "${ED}${dest}"/lib-python/*2.7/test/test_{tcl,tk,ttk*}.py || die |
682 |
- fi |
683 |
- |
684 |
- local -x PYTHON=${ED}${dest}/pypy-c |
685 |
- # we can't use eclass function since PyPy is dumb and always gives |
686 |
- # paths relative to the interpreter |
687 |
- local PYTHON_SITEDIR=${EPREFIX}/usr/lib/pypy2.7/site-packages |
688 |
- python_export pypy EPYTHON |
689 |
- |
690 |
- echo "EPYTHON='${EPYTHON}'" > epython.py || die |
691 |
- python_domodule epython.py |
692 |
- |
693 |
- einfo "Byte-compiling Python standard library..." |
694 |
- |
695 |
- # compile the installed modules |
696 |
- python_optimize "${ED}${dest}" |
697 |
-} |