1 |
commit: 67c5e0a33d91d170991f57ab7bd672b30e0b2703 |
2 |
Author: Michał Górny <mgorny <AT> gentoo <DOT> org> |
3 |
AuthorDate: Fri Feb 15 05:08:41 2019 +0000 |
4 |
Commit: Michał Górny <mgorny <AT> gentoo <DOT> org> |
5 |
CommitDate: Fri Feb 15 05:10:02 2019 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=67c5e0a3 |
7 |
|
8 |
dev-python/pypy3-bin: Bump to 7.0.0 |
9 |
|
10 |
Closes: https://bugs.gentoo.org/677398 |
11 |
Signed-off-by: Michał Górny <mgorny <AT> gentoo.org> |
12 |
|
13 |
dev-python/pypy3-bin/Manifest | 6 + |
14 |
.../pypy3-bin/files/7.0.0_all_distutils_cxx.patch | 347 +++++++++++++++++++++ |
15 |
dev-python/pypy3-bin/pypy3-bin-7.0.0.ebuild | 178 +++++++++++ |
16 |
3 files changed, 531 insertions(+) |
17 |
|
18 |
diff --git a/dev-python/pypy3-bin/Manifest b/dev-python/pypy3-bin/Manifest |
19 |
index 2f2b56451a9..497dfac6222 100644 |
20 |
--- a/dev-python/pypy3-bin/Manifest |
21 |
+++ b/dev-python/pypy3-bin/Manifest |
22 |
@@ -8,4 +8,10 @@ DIST pypy3-bin-6.0.0-x86+bzip2+ncurses+sse2.ffi7.tar.lz 5384351 BLAKE2B 952676b1 |
23 |
DIST pypy3-bin-6.0.0-x86+bzip2+ncurses+sse2.tar.lz 5363942 BLAKE2B d53b89ef73c2d4ee2bc00360a0c4a791fd8b6ac2d28dfeeb7510a465e6302f79c378aacebbaf4993b6ee55dbc6d85876149fe3f5a0d689713f029c928d93a729 SHA512 ce72d84200dd275841e691810dbf402423883b282cacbe8bbdae9285936869d40b3d43d053b0f3d4904c7ced72f35480d1780358180a1c98e8111852fef1f77f |
24 |
DIST pypy3-bin-6.0.0-x86+bzip2+ncurses.ffi7.tar.lz 5384380 BLAKE2B 7e452d0b163f401d0741e95aa2f55e84eb223eb3152f0299b365d1dd53268d315496977d988149c29e0e3439834d7283bfa9a9e05f2d7a8abb3f3d65aa05e567 SHA512 d743c4275abfbce1ef1ae2949e93097faeca8377e38761183ff7d0cc23b92d93700bf370d1511c968743e769a0b41acfeae01543885cc55bef8cdd2c6817af0f |
25 |
DIST pypy3-bin-6.0.0-x86+bzip2+ncurses.tar.lz 5366917 BLAKE2B 338a9c221048dabc548250edec05256be64dd5d1aeb5b2fff839d7d5e8dda29e7d4e0a03b1fc0c9cd418685c558bb47598c625e2d28cd4caabc45e21eee9f4f8 SHA512 5274535d01564a9087aea486320921c8784cabcc7bde3634c27b9006988fdc745e6e5e5c2fb8e7b0318fd5ca6fda3fce208743cfa079a7474ea44277237ea873 |
26 |
+DIST pypy3-bin-7.0.0-amd64+bzip2+jit+ncurses.tar.lz 11042296 BLAKE2B 3717c92b3e3a0239c3089cc86434db42725f7e42891fcf5c46f7234aca09a6c693ce662a8bedda4e5a9f646f3266ebd16f25668068d6c1d9df30b6696627ec42 SHA512 5108388bd322c5af4e3d411a4c59a4d8b8b4a75e4ad1e53e90ddd9f76f64868b2c31210d8ac5b0d8222402441ca58c781264742e74e5ff872189ed6c24c2707f |
27 |
+DIST pypy3-bin-7.0.0-amd64+bzip2+ncurses.tar.lz 6873174 BLAKE2B 6ed19040d3af0dfd6614441e6fb838328b687c44415e1444f27e74f3db4bd3eeb7c077f0cc95cafcacffaabd396d68f6ff481fdfa44f9e6b26f83f1e61e99e30 SHA512 dbdd3e6a21b4553060804eef1036698324743e5eeb4b9e2933785f93871a750ae98daf5a1ef7061238d6161a6df8d18c590b88dcd0ea97ae4ab742aa4df7dbd3 |
28 |
+DIST pypy3-bin-7.0.0-x86+bzip2+jit+ncurses+sse2.tar.lz 8484244 BLAKE2B d23b84aa9f045e46c2461a4d26383e4fcd0c33283f54e11d0693faafec2d3792039534c9a93b418cb78f3e4d45b98f1377cd0555a20ccb2fdce5b9b2e17a133d SHA512 4c90ee87585a448466883aa47ebd4a3f92438d54fceb6cf752fd638746f1c0f2ab7a3145b310555ab19ba53838352523e981485904c4092bc457c7002931ab59 |
29 |
+DIST pypy3-bin-7.0.0-x86+bzip2+ncurses+sse2.tar.lz 5529689 BLAKE2B 038ad3c9132d430268dad3ae7b1c2b6ca507743f3b2f7a3aef8b7aaa580b070287767878d2b528297c152ecd0a440aaa6a47e32f7aa5400bfda2703302c583fe SHA512 8932dbdf49f7a227e9108bcfd0e7136cd1287b036eee7665bf16868a0e322ca841eb6daa6a18b8a57e4184b8878abd20de9616f90845c0dc76d5382f7f53f3a3 |
30 |
+DIST pypy3-bin-7.0.0-x86+bzip2+ncurses.tar.lz 5537714 BLAKE2B 49cdf63c1f94899ec4642d395dbf8ae6fe44fe9fc46e7f64b31e30d20f9e1dcc5d40b511d582f6c902724f5629e7b3b8e1090d76a3bb1a789b32b1c29b533e87 SHA512 42c8afa8fea5474d5b2c7c7192b2a79d8a3eb8d832038aad68edb011c056d6efb3903e67084f423ff167b1757804a5d796fddfa6f6f077966c855a1e56eba9cc |
31 |
DIST pypy3-v6.0.0-src.tar.bz2 22648140 BLAKE2B b8678859b0c24494788ddf6f410a3ec1a56a04663452e1aba25d3f41c5073a95866d1623f00cb1a6c9d0256df728fa60d1edb5b58d26c0d88577769cc8a6205d SHA512 ea406c4dd1837a6ab13026de01330790f3c18f6e2bfb83e8553e52acf78b43dfb559ce75c2d91395055c771db359356c8183ed950da6f01a21bf09128935af5e |
32 |
+DIST pypy3.5-v7.0.0-src.tar.bz2 22730690 BLAKE2B 312aea1f88303b225bbfa5e82a28d3c2893d9977b03a3fd12923db15c4a77f04ec3fbce947f0684c4e27073836583ef8a5eaf5be05612e564172170740c2a6e3 SHA512 3facac26e06e254cbf244841824b35ec211859123f6ba9f095dc980292c10d9cf1d11de62cc6372cf77e92ee1cd2358bbd794b3ff25cb7172e1b21c02c8ce6c2 |
33 |
|
34 |
diff --git a/dev-python/pypy3-bin/files/7.0.0_all_distutils_cxx.patch b/dev-python/pypy3-bin/files/7.0.0_all_distutils_cxx.patch |
35 |
new file mode 100644 |
36 |
index 00000000000..a9099e5c9dc |
37 |
--- /dev/null |
38 |
+++ b/dev-python/pypy3-bin/files/7.0.0_all_distutils_cxx.patch |
39 |
@@ -0,0 +1,347 @@ |
40 |
+From 5c396fb8b644e5de82d9b54cdb088ea673e16e14 Mon Sep 17 00:00:00 2001 |
41 |
+From: =?UTF-8?q?Micha=C5=82=20G=C3=B3rny?= <mgorny@g.o> |
42 |
+Date: Tue, 25 Apr 2017 17:42:33 +0200 |
43 |
+Subject: [PATCH] Fancy distutils C++ support, rebased for PyPy3.5/7.0.0 |
44 |
+ |
45 |
+https://bugs.python.org/issue1222585 |
46 |
+--- |
47 |
+ lib-python/3/_osx_support.py | 10 ++-- |
48 |
+ lib-python/3/distutils/cygwinccompiler.py | 21 ++++++-- |
49 |
+ lib-python/3/distutils/sysconfig_cpython.py | 25 ++++++++-- |
50 |
+ lib-python/3/distutils/sysconfig_pypy.py | 34 ++++++++++--- |
51 |
+ lib-python/3/distutils/unixccompiler.py | 54 +++++++++++---------- |
52 |
+ lib_pypy/_sysconfigdata.py | 1 + |
53 |
+ 6 files changed, 100 insertions(+), 45 deletions(-) |
54 |
+ |
55 |
+diff --git a/lib-python/3/_osx_support.py b/lib-python/3/_osx_support.py |
56 |
+index 13fcd8b8d2..0525be1cbc 100644 |
57 |
+--- a/lib-python/3/_osx_support.py |
58 |
++++ b/lib-python/3/_osx_support.py |
59 |
+@@ -14,13 +14,13 @@ __all__ = [ |
60 |
+ # configuration variables that may contain universal build flags, |
61 |
+ # like "-arch" or "-isdkroot", that may need customization for |
62 |
+ # the user environment |
63 |
+-_UNIVERSAL_CONFIG_VARS = ('CFLAGS', 'LDFLAGS', 'CPPFLAGS', 'BASECFLAGS', |
64 |
+- 'BLDSHARED', 'LDSHARED', 'CC', 'CXX', |
65 |
+- 'PY_CFLAGS', 'PY_LDFLAGS', 'PY_CPPFLAGS', |
66 |
+- 'PY_CORE_CFLAGS') |
67 |
++_UNIVERSAL_CONFIG_VARS = ('CFLAGS', 'CXXFLAGS', 'LDFLAGS', 'CPPFLAGS', |
68 |
++ 'BASECFLAGS', 'BLDSHARED', 'LDSHARED', 'LDCXXSHARED', |
69 |
++ 'CC', 'CXX', 'PY_CFLAGS', 'PY_LDFLAGS', |
70 |
++ 'PY_CPPFLAGS', 'PY_CORE_CFLAGS') |
71 |
+ |
72 |
+ # configuration variables that may contain compiler calls |
73 |
+-_COMPILER_CONFIG_VARS = ('BLDSHARED', 'LDSHARED', 'CC', 'CXX') |
74 |
++_COMPILER_CONFIG_VARS = ('BLDSHARED', 'LDSHARED', 'LDCXXSHARED', 'CC', 'CXX') |
75 |
+ |
76 |
+ # prefix added to original configuration variable names |
77 |
+ _INITPRE = '_OSX_SUPPORT_INITIAL_' |
78 |
+diff --git a/lib-python/3/distutils/cygwinccompiler.py b/lib-python/3/distutils/cygwinccompiler.py |
79 |
+index c879646c0f..a6157fbd5f 100644 |
80 |
+--- a/lib-python/3/distutils/cygwinccompiler.py |
81 |
++++ b/lib-python/3/distutils/cygwinccompiler.py |
82 |
+@@ -125,8 +125,10 @@ class CygwinCCompiler(UnixCCompiler): |
83 |
+ # dllwrap 2.10.90 is buggy |
84 |
+ if self.ld_version >= "2.10.90": |
85 |
+ self.linker_dll = "gcc" |
86 |
++ self.linker_dll_cxx = "g++" |
87 |
+ else: |
88 |
+ self.linker_dll = "dllwrap" |
89 |
++ self.linker_dll_cxx = "dllwrap" |
90 |
+ |
91 |
+ # ld_version >= "2.13" support -shared so use it instead of |
92 |
+ # -mdll -static |
93 |
+@@ -140,9 +142,13 @@ class CygwinCCompiler(UnixCCompiler): |
94 |
+ self.set_executables(compiler='gcc -mcygwin -O -Wall', |
95 |
+ compiler_so='gcc -mcygwin -mdll -O -Wall', |
96 |
+ compiler_cxx='g++ -mcygwin -O -Wall', |
97 |
++ compiler_so_cxx='g++ -mcygwin -mdll -O -Wall', |
98 |
+ linker_exe='gcc -mcygwin', |
99 |
+ linker_so=('%s -mcygwin %s' % |
100 |
+- (self.linker_dll, shared_option))) |
101 |
++ (self.linker_dll, shared_option)), |
102 |
++ linker_exe_cxx='g++ -mcygwin', |
103 |
++ linker_so_cxx=('%s -mcygwin %s' % |
104 |
++ (self.linker_dll_cxx, shared_option))) |
105 |
+ |
106 |
+ # cygwin and mingw32 need different sets of libraries |
107 |
+ if self.gcc_version == "2.91.57": |
108 |
+@@ -166,8 +172,12 @@ class CygwinCCompiler(UnixCCompiler): |
109 |
+ raise CompileError(msg) |
110 |
+ else: # for other files use the C-compiler |
111 |
+ try: |
112 |
+- self.spawn(self.compiler_so + cc_args + [src, '-o', obj] + |
113 |
+- extra_postargs) |
114 |
++ if self.detect_language(src) == 'c++': |
115 |
++ self.spawn(self.compiler_so_cxx + cc_args + [src, '-o', obj] + |
116 |
++ extra_postargs) |
117 |
++ else: |
118 |
++ self.spawn(self.compiler_so + cc_args + [src, '-o', obj] + |
119 |
++ extra_postargs) |
120 |
+ except DistutilsExecError as msg: |
121 |
+ raise CompileError(msg) |
122 |
+ |
123 |
+@@ -302,9 +312,14 @@ class Mingw32CCompiler(CygwinCCompiler): |
124 |
+ self.set_executables(compiler='gcc -O -Wall', |
125 |
+ compiler_so='gcc -mdll -O -Wall', |
126 |
+ compiler_cxx='g++ -O -Wall', |
127 |
++ compiler_so_cxx='g++ -mdll -O -Wall', |
128 |
+ linker_exe='gcc', |
129 |
+ linker_so='%s %s %s' |
130 |
+ % (self.linker_dll, shared_option, |
131 |
++ entry_point), |
132 |
++ linker_exe_cxx='g++', |
133 |
++ linker_so_cxx='%s %s %s' |
134 |
++ % (self.linker_dll_cxx, shared_option, |
135 |
+ entry_point)) |
136 |
+ # Maybe we should also append -mthreads, but then the finished |
137 |
+ # dlls need another dll (mingwm10.dll see Mingw32 docs) |
138 |
+diff --git a/lib-python/3/distutils/sysconfig_cpython.py b/lib-python/3/distutils/sysconfig_cpython.py |
139 |
+index 573724ddd7..0a04f33a86 100644 |
140 |
+--- a/lib-python/3/distutils/sysconfig_cpython.py |
141 |
++++ b/lib-python/3/distutils/sysconfig_cpython.py |
142 |
+@@ -173,9 +173,12 @@ def customize_compiler(compiler): |
143 |
+ _osx_support.customize_compiler(_config_vars) |
144 |
+ _config_vars['CUSTOMIZED_OSX_COMPILER'] = 'True' |
145 |
+ |
146 |
+- (cc, cxx, opt, cflags, ccshared, ldshared, shlib_suffix, ar, ar_flags) = \ |
147 |
+- get_config_vars('CC', 'CXX', 'OPT', 'CFLAGS', |
148 |
+- 'CCSHARED', 'LDSHARED', 'SHLIB_SUFFIX', 'AR', 'ARFLAGS') |
149 |
++ (cc, cxx, ccshared, ldshared, ldcxxshared, shlib_suffix, ar, ar_flags) = \ |
150 |
++ get_config_vars('CC', 'CXX', 'CCSHARED', 'LDSHARED', 'LDCXXSHARED', |
151 |
++ 'SHLIB_SUFFIX', 'AR', 'ARFLAGS') |
152 |
++ |
153 |
++ cflags = '' |
154 |
++ cxxflags = '' |
155 |
+ |
156 |
+ if 'CC' in os.environ: |
157 |
+ newcc = os.environ['CC'] |
158 |
+@@ -190,19 +193,27 @@ def customize_compiler(compiler): |
159 |
+ cxx = os.environ['CXX'] |
160 |
+ if 'LDSHARED' in os.environ: |
161 |
+ ldshared = os.environ['LDSHARED'] |
162 |
++ if 'LDCXXSHARED' in os.environ: |
163 |
++ ldcxxshared = os.environ['LDCXXSHARED'] |
164 |
+ if 'CPP' in os.environ: |
165 |
+ cpp = os.environ['CPP'] |
166 |
+ else: |
167 |
+ cpp = cc + " -E" # not always |
168 |
+ if 'LDFLAGS' in os.environ: |
169 |
+ ldshared = ldshared + ' ' + os.environ['LDFLAGS'] |
170 |
++ ldcxxshared = ldcxxshared + ' ' + os.environ['LDFLAGS'] |
171 |
+ if 'CFLAGS' in os.environ: |
172 |
+- cflags = opt + ' ' + os.environ['CFLAGS'] |
173 |
++ cflags = os.environ['CFLAGS'] |
174 |
+ ldshared = ldshared + ' ' + os.environ['CFLAGS'] |
175 |
++ if 'CXXFLAGS' in os.environ: |
176 |
++ cxxflags = os.environ['CXXFLAGS'] |
177 |
++ ldcxxshared = ldcxxshared + ' ' + os.environ['CXXFLAGS'] |
178 |
+ if 'CPPFLAGS' in os.environ: |
179 |
+ cpp = cpp + ' ' + os.environ['CPPFLAGS'] |
180 |
+ cflags = cflags + ' ' + os.environ['CPPFLAGS'] |
181 |
++ cxxflags = cxxflags + ' ' + os.environ['CPPFLAGS'] |
182 |
+ ldshared = ldshared + ' ' + os.environ['CPPFLAGS'] |
183 |
++ ldcxxshared = ldcxxshared + ' ' + os.environ['CPPFLAGS'] |
184 |
+ if 'AR' in os.environ: |
185 |
+ ar = os.environ['AR'] |
186 |
+ if 'ARFLAGS' in os.environ: |
187 |
+@@ -211,13 +222,17 @@ def customize_compiler(compiler): |
188 |
+ archiver = ar + ' ' + ar_flags |
189 |
+ |
190 |
+ cc_cmd = cc + ' ' + cflags |
191 |
++ cxx_cmd = cxx + ' ' + cxxflags |
192 |
+ compiler.set_executables( |
193 |
+ preprocessor=cpp, |
194 |
+ compiler=cc_cmd, |
195 |
+ compiler_so=cc_cmd + ' ' + ccshared, |
196 |
+- compiler_cxx=cxx, |
197 |
++ compiler_cxx=cxx_cmd, |
198 |
++ compiler_so_cxx=cxx_cmd + ' ' + ccshared, |
199 |
+ linker_so=ldshared, |
200 |
+ linker_exe=cc, |
201 |
++ linker_so_cxx=ldcxxshared, |
202 |
++ linker_exe_cxx=cxx, |
203 |
+ archiver=archiver) |
204 |
+ |
205 |
+ compiler.shared_lib_extension = shlib_suffix |
206 |
+diff --git a/lib-python/3/distutils/sysconfig_pypy.py b/lib-python/3/distutils/sysconfig_pypy.py |
207 |
+index bf1748e300..70dfd72a1a 100644 |
208 |
+--- a/lib-python/3/distutils/sysconfig_pypy.py |
209 |
++++ b/lib-python/3/distutils/sysconfig_pypy.py |
210 |
+@@ -145,36 +145,52 @@ def customize_compiler(compiler): |
211 |
+ _osx_support.customize_compiler(_config_vars) |
212 |
+ _config_vars['CUSTOMIZED_OSX_COMPILER'] = 'True' |
213 |
+ |
214 |
+- (cc, cxx, opt, cflags, ccshared, ldshared, shlib_suffix, ar, ar_flags) = \ |
215 |
+- get_config_vars('CC', 'CXX', 'OPT', 'CFLAGS', |
216 |
+- 'CCSHARED', 'LDSHARED', 'SHLIB_SUFFIX', 'AR', 'ARFLAGS') |
217 |
++ (cc, cxx, ccshared, ldshared, ldcxxshared, shlib_suffix, ar, ar_flags) = \ |
218 |
++ get_config_vars('CC', 'CXX', 'CCSHARED', 'LDSHARED', 'LDCXXSHARED', |
219 |
++ 'SHLIB_SUFFIX', 'AR', 'ARFLAGS') |
220 |
++ |
221 |
++ cflags = '' |
222 |
++ cxxflags = '' |
223 |
+ |
224 |
+ if 'CC' in os.environ: |
225 |
+ newcc = os.environ['CC'] |
226 |
+- if (sys.platform == 'darwin' |
227 |
++ if (True |
228 |
+ and 'LDSHARED' not in os.environ |
229 |
+ and ldshared.startswith(cc)): |
230 |
+ # On OS X, if CC is overridden, use that as the default |
231 |
+ # command for LDSHARED as well |
232 |
++ # Gentoo: s/OS X/every system/ |
233 |
+ ldshared = newcc + ldshared[len(cc):] |
234 |
+ cc = newcc |
235 |
+ if 'CXX' in os.environ: |
236 |
+- cxx = os.environ['CXX'] |
237 |
++ newcxx = os.environ['CXX'] |
238 |
++ if ('LDCXXSHARED' not in os.environ |
239 |
++ and ldcxxshared.startswith(cxx)): |
240 |
++ ldcxxshared = newcxx + ldcxxshared[len(cxx):] |
241 |
++ cxx = newcxx |
242 |
+ if 'LDSHARED' in os.environ: |
243 |
+ ldshared = os.environ['LDSHARED'] |
244 |
++ if 'LDCXXSHARED' in os.environ: |
245 |
++ ldcxxshared = os.environ['LDCXXSHARED'] |
246 |
+ if 'CPP' in os.environ: |
247 |
+ cpp = os.environ['CPP'] |
248 |
+ else: |
249 |
+ cpp = cc + " -E" # not always |
250 |
+ if 'LDFLAGS' in os.environ: |
251 |
+ ldshared = ldshared + ' ' + os.environ['LDFLAGS'] |
252 |
++ ldcxxshared = ldcxxshared + ' ' + os.environ['LDFLAGS'] |
253 |
+ if 'CFLAGS' in os.environ: |
254 |
+- cflags = opt + ' ' + os.environ['CFLAGS'] |
255 |
++ cflags = os.environ['CFLAGS'] |
256 |
+ ldshared = ldshared + ' ' + os.environ['CFLAGS'] |
257 |
++ if 'CXXFLAGS' in os.environ: |
258 |
++ cxxflags = os.environ['CXXFLAGS'] |
259 |
++ ldcxxshared = ldcxxshared + ' ' + os.environ['CXXFLAGS'] |
260 |
+ if 'CPPFLAGS' in os.environ: |
261 |
+ cpp = cpp + ' ' + os.environ['CPPFLAGS'] |
262 |
+ cflags = cflags + ' ' + os.environ['CPPFLAGS'] |
263 |
++ cxxflags = cxxflags + ' ' + os.environ['CPPFLAGS'] |
264 |
+ ldshared = ldshared + ' ' + os.environ['CPPFLAGS'] |
265 |
++ ldcxxshared = ldcxxshared + ' ' + os.environ['CPPFLAGS'] |
266 |
+ if 'AR' in os.environ: |
267 |
+ ar = os.environ['AR'] |
268 |
+ if 'ARFLAGS' in os.environ: |
269 |
+@@ -183,13 +199,17 @@ def customize_compiler(compiler): |
270 |
+ archiver = ar + ' ' + ar_flags |
271 |
+ |
272 |
+ cc_cmd = cc + ' ' + cflags |
273 |
++ cxx_cmd = cxx + ' ' + cxxflags |
274 |
+ compiler.set_executables( |
275 |
+ preprocessor=cpp, |
276 |
+ compiler=cc_cmd, |
277 |
+ compiler_so=cc_cmd + ' ' + ccshared, |
278 |
+- compiler_cxx=cxx, |
279 |
++ compiler_cxx=cxx_cmd, |
280 |
++ compiler_so_cxx=cxx_cmd + ' ' + ccshared, |
281 |
+ linker_so=ldshared, |
282 |
+ linker_exe=cc, |
283 |
++ linker_so_cxx=ldcxxshared, |
284 |
++ linker_exe_cxx=cxx, |
285 |
+ archiver=archiver) |
286 |
+ |
287 |
+ compiler.shared_lib_extension = shlib_suffix |
288 |
+diff --git a/lib-python/3/distutils/unixccompiler.py b/lib-python/3/distutils/unixccompiler.py |
289 |
+index 32030ed150..1db3d5498b 100644 |
290 |
+--- a/lib-python/3/distutils/unixccompiler.py |
291 |
++++ b/lib-python/3/distutils/unixccompiler.py |
292 |
+@@ -52,14 +52,17 @@ class UnixCCompiler(CCompiler): |
293 |
+ # are pretty generic; they will probably have to be set by an outsider |
294 |
+ # (eg. using information discovered by the sysconfig about building |
295 |
+ # Python extensions). |
296 |
+- executables = {'preprocessor' : None, |
297 |
+- 'compiler' : ["cc"], |
298 |
+- 'compiler_so' : ["cc"], |
299 |
+- 'compiler_cxx' : ["c++"], # pypy: changed, 'cc' is bogus |
300 |
+- 'linker_so' : ["cc", "-shared"], |
301 |
+- 'linker_exe' : ["cc"], |
302 |
+- 'archiver' : ["ar", "-cr"], |
303 |
+- 'ranlib' : None, |
304 |
++ executables = {'preprocessor' : None, |
305 |
++ 'compiler' : ["cc"], |
306 |
++ 'compiler_so' : ["cc"], |
307 |
++ 'compiler_cxx' : ["c++"], |
308 |
++ 'compiler_so_cxx' : ["c++"], |
309 |
++ 'linker_so' : ["cc", "-shared"], |
310 |
++ 'linker_exe' : ["cc"], |
311 |
++ 'linker_so_cxx' : ["c++", "-shared"], |
312 |
++ 'linker_exe_cxx' : ["c++"], |
313 |
++ 'archiver' : ["ar", "-cr"], |
314 |
++ 'ranlib' : None, |
315 |
+ } |
316 |
+ |
317 |
+ if sys.platform[:6] == "darwin": |
318 |
+@@ -125,12 +128,19 @@ class UnixCCompiler(CCompiler): |
319 |
+ |
320 |
+ def _compile(self, obj, src, ext, cc_args, extra_postargs, pp_opts): |
321 |
+ compiler_so = self.compiler_so |
322 |
++ compiler_so_cxx = self.compiler_so_cxx |
323 |
+ if sys.platform == 'darwin': |
324 |
+ compiler_so = _osx_support.compiler_fixup(compiler_so, |
325 |
+ cc_args + extra_postargs) |
326 |
++ compiler_so_cxx = _osx_support.compiler_fixup(compiler_so_cxx, |
327 |
++ cc_args + extra_postargs) |
328 |
+ try: |
329 |
+- self.spawn(compiler_so + cc_args + [src, '-o', obj] + |
330 |
+- extra_postargs) |
331 |
++ if self.detect_language(src) == 'c++': |
332 |
++ self.spawn(compiler_so_cxx + cc_args + [src, '-o', obj] + |
333 |
++ extra_postargs) |
334 |
++ else: |
335 |
++ self.spawn(compiler_so + cc_args + [src, '-o', obj] + |
336 |
++ extra_postargs) |
337 |
+ except DistutilsExecError as msg: |
338 |
+ raise CompileError(msg) |
339 |
+ |
340 |
+@@ -188,22 +198,16 @@ class UnixCCompiler(CCompiler): |
341 |
+ ld_args.extend(extra_postargs) |
342 |
+ self.mkpath(os.path.dirname(output_filename)) |
343 |
+ try: |
344 |
+- if target_desc == CCompiler.EXECUTABLE: |
345 |
+- linker = self.linker_exe[:] |
346 |
++ if target_lang == "c++": |
347 |
++ if target_desc == CCompiler.EXECUTABLE: |
348 |
++ linker = self.linker_exe_cxx[:] |
349 |
++ else: |
350 |
++ linker = self.linker_so_cxx[:] |
351 |
+ else: |
352 |
+- linker = self.linker_so[:] |
353 |
+- if target_lang == "c++" and self.compiler_cxx: |
354 |
+- # skip over environment variable settings if /usr/bin/env |
355 |
+- # is used to set up the linker's environment. |
356 |
+- # This is needed on OSX. Note: this assumes that the |
357 |
+- # normal and C++ compiler have the same environment |
358 |
+- # settings. |
359 |
+- i = 0 |
360 |
+- if os.path.basename(linker[0]) == "env": |
361 |
+- i = 1 |
362 |
+- while '=' in linker[i]: |
363 |
+- i += 1 |
364 |
+- linker[i] = self.compiler_cxx[i] |
365 |
++ if target_desc == CCompiler.EXECUTABLE: |
366 |
++ linker = self.linker_exe[:] |
367 |
++ else: |
368 |
++ linker = self.linker_so[:] |
369 |
+ |
370 |
+ if sys.platform == 'darwin': |
371 |
+ linker = _osx_support.compiler_fixup(linker, ld_args) |
372 |
+diff --git a/lib_pypy/_sysconfigdata.py b/lib_pypy/_sysconfigdata.py |
373 |
+index 2ceafe80bf..ee3f802c41 100644 |
374 |
+--- a/lib_pypy/_sysconfigdata.py |
375 |
++++ b/lib_pypy/_sysconfigdata.py |
376 |
+@@ -15,6 +15,7 @@ build_time_vars = { |
377 |
+ 'CFLAGS': "-DNDEBUG -O2", |
378 |
+ 'CCSHARED': "-fPIC", |
379 |
+ 'LDSHARED': "cc -pthread -shared", |
380 |
++ 'LDCXXSHARED': "c++ -pthread -shared", |
381 |
+ 'EXT_SUFFIX': so_ext, |
382 |
+ 'SHLIB_SUFFIX': ".so", |
383 |
+ 'AR': "ar", |
384 |
+-- |
385 |
+2.20.1 |
386 |
+ |
387 |
|
388 |
diff --git a/dev-python/pypy3-bin/pypy3-bin-7.0.0.ebuild b/dev-python/pypy3-bin/pypy3-bin-7.0.0.ebuild |
389 |
new file mode 100644 |
390 |
index 00000000000..820cb2321a3 |
391 |
--- /dev/null |
392 |
+++ b/dev-python/pypy3-bin/pypy3-bin-7.0.0.ebuild |
393 |
@@ -0,0 +1,178 @@ |
394 |
+# Copyright 1999-2019 Gentoo Authors |
395 |
+# Distributed under the terms of the GNU General Public License v2 |
396 |
+ |
397 |
+EAPI=7 |
398 |
+ |
399 |
+# Test runner needs Python 2. |
400 |
+PYTHON_COMPAT=( python2_7 pypy ) |
401 |
+inherit pax-utils python-any-r1 unpacker |
402 |
+ |
403 |
+BINHOST="https://dev.gentoo.org/~mgorny/dist/pypy3-bin/${PV}" |
404 |
+MY_P=pypy3.5-v${PV} |
405 |
+ |
406 |
+DESCRIPTION="A fast, compliant alternative implementation of Python 3.5 (binary package)" |
407 |
+HOMEPAGE="http://pypy.org/" |
408 |
+SRC_URI="https://bitbucket.org/pypy/pypy/downloads/${MY_P}-src.tar.bz2 |
409 |
+ amd64? ( |
410 |
+ jit? ( ${BINHOST}/${P}-amd64+bzip2+jit+ncurses.tar.lz ) |
411 |
+ !jit? ( ${BINHOST}/${P}-amd64+bzip2+ncurses.tar.lz ) |
412 |
+ ) |
413 |
+ x86? ( |
414 |
+ cpu_flags_x86_sse2? ( |
415 |
+ jit? ( ${BINHOST}/${P}-x86+bzip2+jit+ncurses+sse2.tar.lz ) |
416 |
+ !jit? ( ${BINHOST}/${P}-x86+bzip2+ncurses+sse2.tar.lz ) |
417 |
+ ) |
418 |
+ !cpu_flags_x86_sse2? ( |
419 |
+ !jit? ( ${BINHOST}/${P}-x86+bzip2+ncurses.tar.lz ) |
420 |
+ ) |
421 |
+ )" |
422 |
+ |
423 |
+# Supported variants |
424 |
+REQUIRED_USE="x86? ( !cpu_flags_x86_sse2? ( !jit ) )" |
425 |
+ |
426 |
+LICENSE="MIT" |
427 |
+# pypy3 -c 'import sysconfig; print(sysconfig.get_config_var("SOABI"))' |
428 |
+SLOT="0/71" |
429 |
+KEYWORDS="~amd64 ~x86" |
430 |
+IUSE="gdbm +jit libressl sqlite cpu_flags_x86_sse2 test tk" |
431 |
+ |
432 |
+RDEPEND=" |
433 |
+ app-arch/bzip2:0/1 |
434 |
+ dev-libs/expat:0/0 |
435 |
+ dev-libs/libffi:0/7 |
436 |
+ sys-devel/gcc:* |
437 |
+ sys-libs/glibc |
438 |
+ sys-libs/ncurses:0/6 |
439 |
+ sys-libs/zlib:0/1 |
440 |
+ gdbm? ( sys-libs/gdbm:0= ) |
441 |
+ !libressl? ( dev-libs/openssl:0=[-bindist] ) |
442 |
+ libressl? ( dev-libs/libressl:0= ) |
443 |
+ sqlite? ( dev-db/sqlite:3= ) |
444 |
+ tk? ( |
445 |
+ dev-lang/tk:0= |
446 |
+ dev-tcltk/tix:0= |
447 |
+ ) |
448 |
+ !dev-python/pypy3:0" |
449 |
+DEPEND="${RDEPEND} |
450 |
+ app-arch/lzip |
451 |
+ app-arch/xz-utils |
452 |
+ test? ( ${PYTHON_DEPS} )" |
453 |
+ |
454 |
+S=${WORKDIR}/${MY_P}-src |
455 |
+ |
456 |
+QA_PREBUILT=" |
457 |
+ usr/lib*/pypy3/pypy3-c |
458 |
+ usr/lib*/pypy3/libpypy3-c.so" |
459 |
+ |
460 |
+src_prepare() { |
461 |
+ eapply "${FILESDIR}/1.9-distutils.unixccompiler.UnixCCompiler.runtime_library_dir_option.patch" |
462 |
+ eapply "${FILESDIR}"/7.0.0_all_distutils_cxx.patch |
463 |
+ |
464 |
+ # apply CPython stdlib patches |
465 |
+ pushd lib-python/3 > /dev/null || die |
466 |
+ eapply "${FILESDIR}"/python-3.5-distutils-OO-build.patch |
467 |
+ popd > /dev/null || die |
468 |
+ |
469 |
+ eapply_user |
470 |
+} |
471 |
+ |
472 |
+src_compile() { |
473 |
+ # Tadaam! PyPy compiled! |
474 |
+ mv "${WORKDIR}"/${P}*/{libpypy3-c.so,pypy3-c} . || die |
475 |
+ mv "${WORKDIR}"/${P}*/include/*.h include/ || die |
476 |
+ mv pypy/module/cpyext/include/*.h include/ || die |
477 |
+ mv pypy/module/cpyext/parse/*.h include/ || die |
478 |
+ |
479 |
+ pax-mark m pypy3-c libpypy3-c.so |
480 |
+ |
481 |
+ einfo "Generating caches and CFFI modules ..." |
482 |
+ |
483 |
+ # Generate Grammar and PatternGrammar pickles. |
484 |
+ ./pypy3-c -c "import lib2to3.pygram, lib2to3.patcomp; lib2to3.patcomp.PatternCompiler()" \ |
485 |
+ || die "Generation of Grammar and PatternGrammar pickles failed" |
486 |
+ |
487 |
+ # Generate cffi modules |
488 |
+ # Please keep in sync with pypy/tool/build_cffi_imports.py! |
489 |
+#cffi_build_scripts = { |
490 |
+# "sqlite3": "_sqlite3_build.py", |
491 |
+# "audioop": "_audioop_build.py", |
492 |
+# "tk": "_tkinter/tklib_build.py", |
493 |
+# "curses": "_curses_build.py" if sys.platform != "win32" else None, |
494 |
+# "syslog": "_syslog_build.py" if sys.platform != "win32" else None, |
495 |
+# "_gdbm": "_gdbm_build.py" if sys.platform != "win32" else None, |
496 |
+# "pwdgrp": "_pwdgrp_build.py" if sys.platform != "win32" else None, |
497 |
+# "resource": "_resource_build.py" if sys.platform != "win32" else None, |
498 |
+# "lzma": "_lzma_build.py", |
499 |
+# "_decimal": "_decimal_build.py", |
500 |
+# "ssl": "_ssl_build.py", |
501 |
+ cffi_targets=( audioop curses syslog pwdgrp resource lzma decimal ssl ) |
502 |
+ use gdbm && cffi_targets+=( gdbm ) |
503 |
+ use sqlite && cffi_targets+=( sqlite3 ) |
504 |
+ use tk && cffi_targets+=( tkinter/tklib ) |
505 |
+ |
506 |
+ local t |
507 |
+ # all modules except tkinter output to . |
508 |
+ # tkinter outputs to the correct dir ... |
509 |
+ cd lib_pypy || die |
510 |
+ for t in "${cffi_targets[@]}"; do |
511 |
+ # tkinter doesn't work via -m |
512 |
+ ../pypy3-c "_${t}_build.py" || die "Failed to build CFFI bindings for ${t}" |
513 |
+ done |
514 |
+ |
515 |
+ # Cleanup temporary objects |
516 |
+ find -name "_cffi_*.[co]" -delete || die |
517 |
+ find -type d -empty -delete || die |
518 |
+} |
519 |
+ |
520 |
+src_test() { |
521 |
+ # (unset) |
522 |
+ local -x PYTHONDONTWRITEBYTECODE= |
523 |
+ |
524 |
+ # Test runner requires Python 2 too. However, it spawns PyPy3 |
525 |
+ # internally so that we end up testing the correct interpreter. |
526 |
+ "${PYTHON}" ./pypy/test_all.py --pypy=./pypy3-c -vv lib-python || die |
527 |
+} |
528 |
+ |
529 |
+src_install() { |
530 |
+ local dest=/usr/lib/pypy3.5 |
531 |
+ einfo "Installing PyPy ..." |
532 |
+ exeinto "${dest}" |
533 |
+ doexe pypy3-c libpypy3-c.so |
534 |
+ pax-mark m "${ED%/}${dest}/pypy3-c" "${ED%/}${dest}/libpypy3-c.so" |
535 |
+ insinto "${dest}" |
536 |
+ # preserve mtimes to avoid obsoleting caches |
537 |
+ insopts -p |
538 |
+ doins -r include lib_pypy lib-python |
539 |
+ dosym ../lib/pypy3.5/pypy3-c /usr/bin/pypy3 |
540 |
+ dodoc README.rst |
541 |
+ |
542 |
+ if ! use gdbm; then |
543 |
+ rm -r "${ED%/}${dest}"/lib_pypy/_gdbm* || die |
544 |
+ fi |
545 |
+ if ! use sqlite; then |
546 |
+ rm -r "${ED%/}${dest}"/lib-python/*3/sqlite3 \ |
547 |
+ "${ED%/}${dest}"/lib_pypy/_sqlite3* \ |
548 |
+ "${ED%/}${dest}"/lib-python/*3/test/test_sqlite.py || die |
549 |
+ fi |
550 |
+ if ! use tk; then |
551 |
+ rm -r "${ED%/}${dest}"/lib-python/*3/{idlelib,tkinter} \ |
552 |
+ "${ED%/}${dest}"/lib_pypy/_tkinter \ |
553 |
+ "${ED%/}${dest}"/lib-python/*3/test/test_{tcl,tk,ttk*}.py || die |
554 |
+ fi |
555 |
+ |
556 |
+ einfo "Generating caches and byte-compiling ..." |
557 |
+ |
558 |
+ local -x PYTHON=${ED%/}${dest}/pypy3-c |
559 |
+ # we can't use eclass function since PyPy is dumb and always gives |
560 |
+ # paths relative to the interpreter |
561 |
+ local PYTHON_SITEDIR=${EPREFIX}/usr/lib/pypy3.5/site-packages |
562 |
+ python_export pypy3 EPYTHON |
563 |
+ |
564 |
+ echo "EPYTHON='${EPYTHON}'" > epython.py || die |
565 |
+ python_domodule epython.py |
566 |
+ |
567 |
+ einfo "Byte-compiling Python standard library..." |
568 |
+ |
569 |
+ # compile the installed modules |
570 |
+ python_optimize "${ED%/}${dest}" |
571 |
+} |