1 |
commit: 0a8566d5827b15e7236a0ee3d02885ebcc398b73 |
2 |
Author: Michał Górny <mgorny <AT> gentoo <DOT> org> |
3 |
AuthorDate: Fri Nov 1 07:49:06 2019 +0000 |
4 |
Commit: Michał Górny <mgorny <AT> gentoo <DOT> org> |
5 |
CommitDate: Fri Nov 1 08:03:32 2019 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0a8566d5 |
7 |
|
8 |
dev-python/pypy3-bin: Drop 7.1.1 |
9 |
|
10 |
Signed-off-by: Michał Górny <mgorny <AT> gentoo.org> |
11 |
|
12 |
dev-python/pypy3-bin/Manifest | 7 - |
13 |
.../pypy3-bin/files/7.0.0_all_distutils_cxx.patch | 347 --------------------- |
14 |
dev-python/pypy3-bin/pypy3-bin-7.1.1-r1.ebuild | 188 ----------- |
15 |
dev-python/pypy3-bin/pypy3-bin-7.1.1.ebuild | 188 ----------- |
16 |
4 files changed, 730 deletions(-) |
17 |
|
18 |
diff --git a/dev-python/pypy3-bin/Manifest b/dev-python/pypy3-bin/Manifest |
19 |
index 7ed305dcae7..5fce1c7302c 100644 |
20 |
--- a/dev-python/pypy3-bin/Manifest |
21 |
+++ b/dev-python/pypy3-bin/Manifest |
22 |
@@ -1,12 +1,5 @@ |
23 |
-DIST pypy3-bin-7.1.1-amd64+bzip2+jit+ncurses.tar.lz 11031375 BLAKE2B e01ac298d3c8ed06742429b36739223fd0dbf87a9df4d302349401aeda06dbaf5cd8b972ebe997a1e4130a378d63ab69ed25b3ded4b9608db5d59fbaef8d04f6 SHA512 e5ccf27683dc81a683df52f04092167774f3a9c9dd3a38347dc9d5cec181148885ed342165b16689d44533511cb58bfcfa397a5e51869649086fa362a3bebc98 |
24 |
-DIST pypy3-bin-7.1.1-amd64+bzip2+ncurses.tar.lz 6915836 BLAKE2B 0f3f2210e7f6e73872d32b2c01a911b52ad2a8c8987034709d9e4c72cfe11e422eea7b6522b19b3717876307d9fbbfbdfcc008dc2e3771dea083eeb61c202e6e SHA512 7fe6a19f56d7cdc142b368154e17af8936b8b730102c4a1c8a6b756a13b643d1375a51f45a0a3d345f7a8a23b75a81d35a6aa810129d231bf2091e156f69a914 |
25 |
-DIST pypy3-bin-7.1.1-x86+bzip2+jit+ncurses+sse2.tar.lz 8540485 BLAKE2B a7de0db24e4bc56d54cbc03d618f8e08932e23a1fe5a1ab227600c244e222a6dae723c72fbd5cdd059c3e3f52bd355c4c9ee18506f6b39961bd1473358d35bd3 SHA512 f3355109bc073e220a33e8763c2d2ccf152d223d3850bb85aac71c19170ce4b118a84f258a829c486209f3c3014264384b158de17c9a0156c24afcf5b130a8e0 |
26 |
-DIST pypy3-bin-7.1.1-x86+bzip2+ncurses+sse2.tar.lz 5523574 BLAKE2B 44f760842b0f232f7f5fb7a2fe3f60ff1f832dec3b0c16d1fd27ab36d09c12d6be8aa6727a880c3400506ea415317ddfb982439c1a581a03909099eeb6ea8cf6 SHA512 df664a7afa5bdd329d19046c81e362782c4f9358add2b7e54100df10a23434b9a341ec504ac1d49b2b017917937ab23ffd3cf723f86b65d7080789f795f5a4d3 |
27 |
-DIST pypy3-bin-7.1.1-x86+bzip2+ncurses.r1.tar.lz 5550959 BLAKE2B 72b1f84f0c70b07bd622b4d9ba67b165ce047037acc9a4fb46427b07db8793610f71dc389fc5cede209663c7d36750faf6247d5b6eb3be006c6cc58e4a94b0eb SHA512 3c522a9cf0e94aa8c14e9982a09231517c2c2b46e73a9c69bc6c43c44afefa3958de8879ac0fff2d43f8a0fc79117bdee645599d8e1d6a0def9806b44a4b1bc9 |
28 |
-DIST pypy3-bin-7.1.1-x86+bzip2+ncurses.tar.lz 5545191 BLAKE2B 2afc40968977cd6956cb305a829811640e8437f0a811435a20ec694181286c94c820fd4148e3b6323a014ff391400d5265a7c1ee8b918c3db91ac02b44f3d585 SHA512 a1dad750491c5f524217986817a046c5c7a97b2b250a1d24b6a077d2d8067e249966cd331a5336fa2960a3d317c1aa83196c3e3b2f4a0734d79fe43cd9b55032 |
29 |
DIST pypy3-bin-7.2.0-amd64+bzip2+jit+ncurses.tar.lz 11429130 BLAKE2B 41de1efcfc72704a3b8fcee1fa0ca030bca0dc07b75856dbc9ee5a9e40c6298406360d3342dffde38131f6d708a6dc07d3708d6e6478dc95d7c6a6ece2d7b86b SHA512 7a97797a961e12d5498dadb5bc87ad9d43a9e9dea88a7617236dba79230f5f0cc02ab8ab21a60c279cca4a341dd3d814d50d4029b94be1f525bf7b9294d19269 |
30 |
DIST pypy3-bin-7.2.0-amd64+bzip2+ncurses.tar.lz 7174734 BLAKE2B c2f916433a6105a04c70f6b53c43dc479b64f26794a75a6e6b7122fb7d2f4f825c47d2eb82cf95ecb795e494879718aad88661b2fe12faa87b737cbcd20b5a47 SHA512 c4a635b6b819a104ff1b1f3b39363c9bb5cab4299cff2fb6e78c64984691d3116b8378e8a47500f9c626bbf48c4a3a8d26fa23fe2daa945bcc3dc97db9b4a8c9 |
31 |
DIST pypy3-bin-7.2.0-x86+bzip2+jit+ncurses+sse2.tar.lz 8662494 BLAKE2B bf37ac682098c49efba0f05999ce70368c91cbc0012cdcde86303424fd225eb50a8b6fa058e0c3a9511c2668da47a042f1b836f9142ed4b112db43da3addd6ce SHA512 6fc0d15e5d82ab06937ca099d1ea2f77d00a6d4e1b4c6d9637c39944c0f077ae0c5eb0edb7c6746aaafb76cb0e8a0458340c888e340df2c8438515f55a38017e |
32 |
DIST pypy3-bin-7.2.0-x86+bzip2+ncurses+sse2.tar.lz 5625900 BLAKE2B d6642cc8b37f9c032ed23da41c5597bd41615c55312bee5b0de3e8543fb74ecf2504c74d9d3c8a51c0fc42285812835cab70d6f8a5a5f15f0d7b637260e0a656 SHA512 1014ea6d37cfa7a6cb60eb47b6a0e959036aaa5c774852484a57f75d4e5450fb50c1b170f571a1288ba70d710b0731e946773cb05751eca6478b4fffb185dc94 |
33 |
-DIST pypy3.6-v7.1.1-src.tar.bz2 23171982 BLAKE2B be43528bc6f3e02d146016a4969bd8c7a9e880a3bd3b77f441aac6d22ef67700f71e0171ec000066bd2c0bd506db64af69d6b75b59a92222dd0353ee70e6629b SHA512 17e78f9c7080d597a6283d8e8247d1ca78f09a14ff221db8c3d90d255b5befc73102b317ca34a80979e544d5ee72f3e5e649f89d185a085f4cc15012da4d0473 |
34 |
DIST pypy3.6-v7.2.0-src.tar.bz2 21850076 BLAKE2B 756ea3034fe8971c979ec83c9cbfac55a680f3ef03b276475aa4318f3480ae5ede609b8413412df64db553a33979670498b1f97184f3b57406619c9db7f01127 SHA512 bcbb53062a473d504bcc082cf6286f6169c83d1f38d22c4d7c4e46ddc32bca9d91e71194637e6650db5bec02b29fe262b22fe236d627b6bc3e6e0c59c66c07cc |
35 |
|
36 |
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 |
37 |
deleted file mode 100644 |
38 |
index a9099e5c9dc..00000000000 |
39 |
--- a/dev-python/pypy3-bin/files/7.0.0_all_distutils_cxx.patch |
40 |
+++ /dev/null |
41 |
@@ -1,347 +0,0 @@ |
42 |
-From 5c396fb8b644e5de82d9b54cdb088ea673e16e14 Mon Sep 17 00:00:00 2001 |
43 |
-From: =?UTF-8?q?Micha=C5=82=20G=C3=B3rny?= <mgorny@g.o> |
44 |
-Date: Tue, 25 Apr 2017 17:42:33 +0200 |
45 |
-Subject: [PATCH] Fancy distutils C++ support, rebased for PyPy3.5/7.0.0 |
46 |
- |
47 |
-https://bugs.python.org/issue1222585 |
48 |
---- |
49 |
- lib-python/3/_osx_support.py | 10 ++-- |
50 |
- lib-python/3/distutils/cygwinccompiler.py | 21 ++++++-- |
51 |
- lib-python/3/distutils/sysconfig_cpython.py | 25 ++++++++-- |
52 |
- lib-python/3/distutils/sysconfig_pypy.py | 34 ++++++++++--- |
53 |
- lib-python/3/distutils/unixccompiler.py | 54 +++++++++++---------- |
54 |
- lib_pypy/_sysconfigdata.py | 1 + |
55 |
- 6 files changed, 100 insertions(+), 45 deletions(-) |
56 |
- |
57 |
-diff --git a/lib-python/3/_osx_support.py b/lib-python/3/_osx_support.py |
58 |
-index 13fcd8b8d2..0525be1cbc 100644 |
59 |
---- a/lib-python/3/_osx_support.py |
60 |
-+++ b/lib-python/3/_osx_support.py |
61 |
-@@ -14,13 +14,13 @@ __all__ = [ |
62 |
- # configuration variables that may contain universal build flags, |
63 |
- # like "-arch" or "-isdkroot", that may need customization for |
64 |
- # the user environment |
65 |
--_UNIVERSAL_CONFIG_VARS = ('CFLAGS', 'LDFLAGS', 'CPPFLAGS', 'BASECFLAGS', |
66 |
-- 'BLDSHARED', 'LDSHARED', 'CC', 'CXX', |
67 |
-- 'PY_CFLAGS', 'PY_LDFLAGS', 'PY_CPPFLAGS', |
68 |
-- 'PY_CORE_CFLAGS') |
69 |
-+_UNIVERSAL_CONFIG_VARS = ('CFLAGS', 'CXXFLAGS', 'LDFLAGS', 'CPPFLAGS', |
70 |
-+ 'BASECFLAGS', 'BLDSHARED', 'LDSHARED', 'LDCXXSHARED', |
71 |
-+ 'CC', 'CXX', 'PY_CFLAGS', 'PY_LDFLAGS', |
72 |
-+ 'PY_CPPFLAGS', 'PY_CORE_CFLAGS') |
73 |
- |
74 |
- # configuration variables that may contain compiler calls |
75 |
--_COMPILER_CONFIG_VARS = ('BLDSHARED', 'LDSHARED', 'CC', 'CXX') |
76 |
-+_COMPILER_CONFIG_VARS = ('BLDSHARED', 'LDSHARED', 'LDCXXSHARED', 'CC', 'CXX') |
77 |
- |
78 |
- # prefix added to original configuration variable names |
79 |
- _INITPRE = '_OSX_SUPPORT_INITIAL_' |
80 |
-diff --git a/lib-python/3/distutils/cygwinccompiler.py b/lib-python/3/distutils/cygwinccompiler.py |
81 |
-index c879646c0f..a6157fbd5f 100644 |
82 |
---- a/lib-python/3/distutils/cygwinccompiler.py |
83 |
-+++ b/lib-python/3/distutils/cygwinccompiler.py |
84 |
-@@ -125,8 +125,10 @@ class CygwinCCompiler(UnixCCompiler): |
85 |
- # dllwrap 2.10.90 is buggy |
86 |
- if self.ld_version >= "2.10.90": |
87 |
- self.linker_dll = "gcc" |
88 |
-+ self.linker_dll_cxx = "g++" |
89 |
- else: |
90 |
- self.linker_dll = "dllwrap" |
91 |
-+ self.linker_dll_cxx = "dllwrap" |
92 |
- |
93 |
- # ld_version >= "2.13" support -shared so use it instead of |
94 |
- # -mdll -static |
95 |
-@@ -140,9 +142,13 @@ class CygwinCCompiler(UnixCCompiler): |
96 |
- self.set_executables(compiler='gcc -mcygwin -O -Wall', |
97 |
- compiler_so='gcc -mcygwin -mdll -O -Wall', |
98 |
- compiler_cxx='g++ -mcygwin -O -Wall', |
99 |
-+ compiler_so_cxx='g++ -mcygwin -mdll -O -Wall', |
100 |
- linker_exe='gcc -mcygwin', |
101 |
- linker_so=('%s -mcygwin %s' % |
102 |
-- (self.linker_dll, shared_option))) |
103 |
-+ (self.linker_dll, shared_option)), |
104 |
-+ linker_exe_cxx='g++ -mcygwin', |
105 |
-+ linker_so_cxx=('%s -mcygwin %s' % |
106 |
-+ (self.linker_dll_cxx, shared_option))) |
107 |
- |
108 |
- # cygwin and mingw32 need different sets of libraries |
109 |
- if self.gcc_version == "2.91.57": |
110 |
-@@ -166,8 +172,12 @@ class CygwinCCompiler(UnixCCompiler): |
111 |
- raise CompileError(msg) |
112 |
- else: # for other files use the C-compiler |
113 |
- try: |
114 |
-- self.spawn(self.compiler_so + cc_args + [src, '-o', obj] + |
115 |
-- extra_postargs) |
116 |
-+ if self.detect_language(src) == 'c++': |
117 |
-+ self.spawn(self.compiler_so_cxx + cc_args + [src, '-o', obj] + |
118 |
-+ extra_postargs) |
119 |
-+ else: |
120 |
-+ self.spawn(self.compiler_so + cc_args + [src, '-o', obj] + |
121 |
-+ extra_postargs) |
122 |
- except DistutilsExecError as msg: |
123 |
- raise CompileError(msg) |
124 |
- |
125 |
-@@ -302,9 +312,14 @@ class Mingw32CCompiler(CygwinCCompiler): |
126 |
- self.set_executables(compiler='gcc -O -Wall', |
127 |
- compiler_so='gcc -mdll -O -Wall', |
128 |
- compiler_cxx='g++ -O -Wall', |
129 |
-+ compiler_so_cxx='g++ -mdll -O -Wall', |
130 |
- linker_exe='gcc', |
131 |
- linker_so='%s %s %s' |
132 |
- % (self.linker_dll, shared_option, |
133 |
-+ entry_point), |
134 |
-+ linker_exe_cxx='g++', |
135 |
-+ linker_so_cxx='%s %s %s' |
136 |
-+ % (self.linker_dll_cxx, shared_option, |
137 |
- entry_point)) |
138 |
- # Maybe we should also append -mthreads, but then the finished |
139 |
- # dlls need another dll (mingwm10.dll see Mingw32 docs) |
140 |
-diff --git a/lib-python/3/distutils/sysconfig_cpython.py b/lib-python/3/distutils/sysconfig_cpython.py |
141 |
-index 573724ddd7..0a04f33a86 100644 |
142 |
---- a/lib-python/3/distutils/sysconfig_cpython.py |
143 |
-+++ b/lib-python/3/distutils/sysconfig_cpython.py |
144 |
-@@ -173,9 +173,12 @@ def customize_compiler(compiler): |
145 |
- _osx_support.customize_compiler(_config_vars) |
146 |
- _config_vars['CUSTOMIZED_OSX_COMPILER'] = 'True' |
147 |
- |
148 |
-- (cc, cxx, opt, cflags, ccshared, ldshared, shlib_suffix, ar, ar_flags) = \ |
149 |
-- get_config_vars('CC', 'CXX', 'OPT', 'CFLAGS', |
150 |
-- 'CCSHARED', 'LDSHARED', 'SHLIB_SUFFIX', 'AR', 'ARFLAGS') |
151 |
-+ (cc, cxx, ccshared, ldshared, ldcxxshared, shlib_suffix, ar, ar_flags) = \ |
152 |
-+ get_config_vars('CC', 'CXX', 'CCSHARED', 'LDSHARED', 'LDCXXSHARED', |
153 |
-+ 'SHLIB_SUFFIX', 'AR', 'ARFLAGS') |
154 |
-+ |
155 |
-+ cflags = '' |
156 |
-+ cxxflags = '' |
157 |
- |
158 |
- if 'CC' in os.environ: |
159 |
- newcc = os.environ['CC'] |
160 |
-@@ -190,19 +193,27 @@ def customize_compiler(compiler): |
161 |
- cxx = os.environ['CXX'] |
162 |
- if 'LDSHARED' in os.environ: |
163 |
- ldshared = os.environ['LDSHARED'] |
164 |
-+ if 'LDCXXSHARED' in os.environ: |
165 |
-+ ldcxxshared = os.environ['LDCXXSHARED'] |
166 |
- if 'CPP' in os.environ: |
167 |
- cpp = os.environ['CPP'] |
168 |
- else: |
169 |
- cpp = cc + " -E" # not always |
170 |
- if 'LDFLAGS' in os.environ: |
171 |
- ldshared = ldshared + ' ' + os.environ['LDFLAGS'] |
172 |
-+ ldcxxshared = ldcxxshared + ' ' + os.environ['LDFLAGS'] |
173 |
- if 'CFLAGS' in os.environ: |
174 |
-- cflags = opt + ' ' + os.environ['CFLAGS'] |
175 |
-+ cflags = os.environ['CFLAGS'] |
176 |
- ldshared = ldshared + ' ' + os.environ['CFLAGS'] |
177 |
-+ if 'CXXFLAGS' in os.environ: |
178 |
-+ cxxflags = os.environ['CXXFLAGS'] |
179 |
-+ ldcxxshared = ldcxxshared + ' ' + os.environ['CXXFLAGS'] |
180 |
- if 'CPPFLAGS' in os.environ: |
181 |
- cpp = cpp + ' ' + os.environ['CPPFLAGS'] |
182 |
- cflags = cflags + ' ' + os.environ['CPPFLAGS'] |
183 |
-+ cxxflags = cxxflags + ' ' + os.environ['CPPFLAGS'] |
184 |
- ldshared = ldshared + ' ' + os.environ['CPPFLAGS'] |
185 |
-+ ldcxxshared = ldcxxshared + ' ' + os.environ['CPPFLAGS'] |
186 |
- if 'AR' in os.environ: |
187 |
- ar = os.environ['AR'] |
188 |
- if 'ARFLAGS' in os.environ: |
189 |
-@@ -211,13 +222,17 @@ def customize_compiler(compiler): |
190 |
- archiver = ar + ' ' + ar_flags |
191 |
- |
192 |
- cc_cmd = cc + ' ' + cflags |
193 |
-+ cxx_cmd = cxx + ' ' + cxxflags |
194 |
- compiler.set_executables( |
195 |
- preprocessor=cpp, |
196 |
- compiler=cc_cmd, |
197 |
- compiler_so=cc_cmd + ' ' + ccshared, |
198 |
-- compiler_cxx=cxx, |
199 |
-+ compiler_cxx=cxx_cmd, |
200 |
-+ compiler_so_cxx=cxx_cmd + ' ' + ccshared, |
201 |
- linker_so=ldshared, |
202 |
- linker_exe=cc, |
203 |
-+ linker_so_cxx=ldcxxshared, |
204 |
-+ linker_exe_cxx=cxx, |
205 |
- archiver=archiver) |
206 |
- |
207 |
- compiler.shared_lib_extension = shlib_suffix |
208 |
-diff --git a/lib-python/3/distutils/sysconfig_pypy.py b/lib-python/3/distutils/sysconfig_pypy.py |
209 |
-index bf1748e300..70dfd72a1a 100644 |
210 |
---- a/lib-python/3/distutils/sysconfig_pypy.py |
211 |
-+++ b/lib-python/3/distutils/sysconfig_pypy.py |
212 |
-@@ -145,36 +145,52 @@ def customize_compiler(compiler): |
213 |
- _osx_support.customize_compiler(_config_vars) |
214 |
- _config_vars['CUSTOMIZED_OSX_COMPILER'] = 'True' |
215 |
- |
216 |
-- (cc, cxx, opt, cflags, ccshared, ldshared, shlib_suffix, ar, ar_flags) = \ |
217 |
-- get_config_vars('CC', 'CXX', 'OPT', 'CFLAGS', |
218 |
-- 'CCSHARED', 'LDSHARED', 'SHLIB_SUFFIX', 'AR', 'ARFLAGS') |
219 |
-+ (cc, cxx, ccshared, ldshared, ldcxxshared, shlib_suffix, ar, ar_flags) = \ |
220 |
-+ get_config_vars('CC', 'CXX', 'CCSHARED', 'LDSHARED', 'LDCXXSHARED', |
221 |
-+ 'SHLIB_SUFFIX', 'AR', 'ARFLAGS') |
222 |
-+ |
223 |
-+ cflags = '' |
224 |
-+ cxxflags = '' |
225 |
- |
226 |
- if 'CC' in os.environ: |
227 |
- newcc = os.environ['CC'] |
228 |
-- if (sys.platform == 'darwin' |
229 |
-+ if (True |
230 |
- and 'LDSHARED' not in os.environ |
231 |
- and ldshared.startswith(cc)): |
232 |
- # On OS X, if CC is overridden, use that as the default |
233 |
- # command for LDSHARED as well |
234 |
-+ # Gentoo: s/OS X/every system/ |
235 |
- ldshared = newcc + ldshared[len(cc):] |
236 |
- cc = newcc |
237 |
- if 'CXX' in os.environ: |
238 |
-- cxx = os.environ['CXX'] |
239 |
-+ newcxx = os.environ['CXX'] |
240 |
-+ if ('LDCXXSHARED' not in os.environ |
241 |
-+ and ldcxxshared.startswith(cxx)): |
242 |
-+ ldcxxshared = newcxx + ldcxxshared[len(cxx):] |
243 |
-+ cxx = newcxx |
244 |
- if 'LDSHARED' in os.environ: |
245 |
- ldshared = os.environ['LDSHARED'] |
246 |
-+ if 'LDCXXSHARED' in os.environ: |
247 |
-+ ldcxxshared = os.environ['LDCXXSHARED'] |
248 |
- if 'CPP' in os.environ: |
249 |
- cpp = os.environ['CPP'] |
250 |
- else: |
251 |
- cpp = cc + " -E" # not always |
252 |
- if 'LDFLAGS' in os.environ: |
253 |
- ldshared = ldshared + ' ' + os.environ['LDFLAGS'] |
254 |
-+ ldcxxshared = ldcxxshared + ' ' + os.environ['LDFLAGS'] |
255 |
- if 'CFLAGS' in os.environ: |
256 |
-- cflags = opt + ' ' + os.environ['CFLAGS'] |
257 |
-+ cflags = os.environ['CFLAGS'] |
258 |
- ldshared = ldshared + ' ' + os.environ['CFLAGS'] |
259 |
-+ if 'CXXFLAGS' in os.environ: |
260 |
-+ cxxflags = os.environ['CXXFLAGS'] |
261 |
-+ ldcxxshared = ldcxxshared + ' ' + os.environ['CXXFLAGS'] |
262 |
- if 'CPPFLAGS' in os.environ: |
263 |
- cpp = cpp + ' ' + os.environ['CPPFLAGS'] |
264 |
- cflags = cflags + ' ' + os.environ['CPPFLAGS'] |
265 |
-+ cxxflags = cxxflags + ' ' + os.environ['CPPFLAGS'] |
266 |
- ldshared = ldshared + ' ' + os.environ['CPPFLAGS'] |
267 |
-+ ldcxxshared = ldcxxshared + ' ' + os.environ['CPPFLAGS'] |
268 |
- if 'AR' in os.environ: |
269 |
- ar = os.environ['AR'] |
270 |
- if 'ARFLAGS' in os.environ: |
271 |
-@@ -183,13 +199,17 @@ def customize_compiler(compiler): |
272 |
- archiver = ar + ' ' + ar_flags |
273 |
- |
274 |
- cc_cmd = cc + ' ' + cflags |
275 |
-+ cxx_cmd = cxx + ' ' + cxxflags |
276 |
- compiler.set_executables( |
277 |
- preprocessor=cpp, |
278 |
- compiler=cc_cmd, |
279 |
- compiler_so=cc_cmd + ' ' + ccshared, |
280 |
-- compiler_cxx=cxx, |
281 |
-+ compiler_cxx=cxx_cmd, |
282 |
-+ compiler_so_cxx=cxx_cmd + ' ' + ccshared, |
283 |
- linker_so=ldshared, |
284 |
- linker_exe=cc, |
285 |
-+ linker_so_cxx=ldcxxshared, |
286 |
-+ linker_exe_cxx=cxx, |
287 |
- archiver=archiver) |
288 |
- |
289 |
- compiler.shared_lib_extension = shlib_suffix |
290 |
-diff --git a/lib-python/3/distutils/unixccompiler.py b/lib-python/3/distutils/unixccompiler.py |
291 |
-index 32030ed150..1db3d5498b 100644 |
292 |
---- a/lib-python/3/distutils/unixccompiler.py |
293 |
-+++ b/lib-python/3/distutils/unixccompiler.py |
294 |
-@@ -52,14 +52,17 @@ class UnixCCompiler(CCompiler): |
295 |
- # are pretty generic; they will probably have to be set by an outsider |
296 |
- # (eg. using information discovered by the sysconfig about building |
297 |
- # Python extensions). |
298 |
-- executables = {'preprocessor' : None, |
299 |
-- 'compiler' : ["cc"], |
300 |
-- 'compiler_so' : ["cc"], |
301 |
-- 'compiler_cxx' : ["c++"], # pypy: changed, 'cc' is bogus |
302 |
-- 'linker_so' : ["cc", "-shared"], |
303 |
-- 'linker_exe' : ["cc"], |
304 |
-- 'archiver' : ["ar", "-cr"], |
305 |
-- 'ranlib' : None, |
306 |
-+ executables = {'preprocessor' : None, |
307 |
-+ 'compiler' : ["cc"], |
308 |
-+ 'compiler_so' : ["cc"], |
309 |
-+ 'compiler_cxx' : ["c++"], |
310 |
-+ 'compiler_so_cxx' : ["c++"], |
311 |
-+ 'linker_so' : ["cc", "-shared"], |
312 |
-+ 'linker_exe' : ["cc"], |
313 |
-+ 'linker_so_cxx' : ["c++", "-shared"], |
314 |
-+ 'linker_exe_cxx' : ["c++"], |
315 |
-+ 'archiver' : ["ar", "-cr"], |
316 |
-+ 'ranlib' : None, |
317 |
- } |
318 |
- |
319 |
- if sys.platform[:6] == "darwin": |
320 |
-@@ -125,12 +128,19 @@ class UnixCCompiler(CCompiler): |
321 |
- |
322 |
- def _compile(self, obj, src, ext, cc_args, extra_postargs, pp_opts): |
323 |
- compiler_so = self.compiler_so |
324 |
-+ compiler_so_cxx = self.compiler_so_cxx |
325 |
- if sys.platform == 'darwin': |
326 |
- compiler_so = _osx_support.compiler_fixup(compiler_so, |
327 |
- cc_args + extra_postargs) |
328 |
-+ compiler_so_cxx = _osx_support.compiler_fixup(compiler_so_cxx, |
329 |
-+ cc_args + extra_postargs) |
330 |
- try: |
331 |
-- self.spawn(compiler_so + cc_args + [src, '-o', obj] + |
332 |
-- extra_postargs) |
333 |
-+ if self.detect_language(src) == 'c++': |
334 |
-+ self.spawn(compiler_so_cxx + cc_args + [src, '-o', obj] + |
335 |
-+ extra_postargs) |
336 |
-+ else: |
337 |
-+ self.spawn(compiler_so + cc_args + [src, '-o', obj] + |
338 |
-+ extra_postargs) |
339 |
- except DistutilsExecError as msg: |
340 |
- raise CompileError(msg) |
341 |
- |
342 |
-@@ -188,22 +198,16 @@ class UnixCCompiler(CCompiler): |
343 |
- ld_args.extend(extra_postargs) |
344 |
- self.mkpath(os.path.dirname(output_filename)) |
345 |
- try: |
346 |
-- if target_desc == CCompiler.EXECUTABLE: |
347 |
-- linker = self.linker_exe[:] |
348 |
-+ if target_lang == "c++": |
349 |
-+ if target_desc == CCompiler.EXECUTABLE: |
350 |
-+ linker = self.linker_exe_cxx[:] |
351 |
-+ else: |
352 |
-+ linker = self.linker_so_cxx[:] |
353 |
- else: |
354 |
-- linker = self.linker_so[:] |
355 |
-- if target_lang == "c++" and self.compiler_cxx: |
356 |
-- # skip over environment variable settings if /usr/bin/env |
357 |
-- # is used to set up the linker's environment. |
358 |
-- # This is needed on OSX. Note: this assumes that the |
359 |
-- # normal and C++ compiler have the same environment |
360 |
-- # settings. |
361 |
-- i = 0 |
362 |
-- if os.path.basename(linker[0]) == "env": |
363 |
-- i = 1 |
364 |
-- while '=' in linker[i]: |
365 |
-- i += 1 |
366 |
-- linker[i] = self.compiler_cxx[i] |
367 |
-+ if target_desc == CCompiler.EXECUTABLE: |
368 |
-+ linker = self.linker_exe[:] |
369 |
-+ else: |
370 |
-+ linker = self.linker_so[:] |
371 |
- |
372 |
- if sys.platform == 'darwin': |
373 |
- linker = _osx_support.compiler_fixup(linker, ld_args) |
374 |
-diff --git a/lib_pypy/_sysconfigdata.py b/lib_pypy/_sysconfigdata.py |
375 |
-index 2ceafe80bf..ee3f802c41 100644 |
376 |
---- a/lib_pypy/_sysconfigdata.py |
377 |
-+++ b/lib_pypy/_sysconfigdata.py |
378 |
-@@ -15,6 +15,7 @@ build_time_vars = { |
379 |
- 'CFLAGS': "-DNDEBUG -O2", |
380 |
- 'CCSHARED': "-fPIC", |
381 |
- 'LDSHARED': "cc -pthread -shared", |
382 |
-+ 'LDCXXSHARED': "c++ -pthread -shared", |
383 |
- 'EXT_SUFFIX': so_ext, |
384 |
- 'SHLIB_SUFFIX': ".so", |
385 |
- 'AR': "ar", |
386 |
--- |
387 |
-2.20.1 |
388 |
- |
389 |
|
390 |
diff --git a/dev-python/pypy3-bin/pypy3-bin-7.1.1-r1.ebuild b/dev-python/pypy3-bin/pypy3-bin-7.1.1-r1.ebuild |
391 |
deleted file mode 100644 |
392 |
index 453ae142dbd..00000000000 |
393 |
--- a/dev-python/pypy3-bin/pypy3-bin-7.1.1-r1.ebuild |
394 |
+++ /dev/null |
395 |
@@ -1,188 +0,0 @@ |
396 |
-# Copyright 1999-2019 Gentoo Authors |
397 |
-# Distributed under the terms of the GNU General Public License v2 |
398 |
- |
399 |
-EAPI=7 |
400 |
- |
401 |
-# Test runner needs Python 2. |
402 |
-PYTHON_COMPAT=( python2_7 pypy ) |
403 |
-inherit pax-utils python-any-r1 unpacker |
404 |
- |
405 |
-BINHOST="https://dev.gentoo.org/~mgorny/dist/pypy3-bin/${PV}" |
406 |
-MY_P=pypy3.6-v${PV} |
407 |
- |
408 |
-DESCRIPTION="A fast, compliant alternative implementation of Python 3.6 (binary package)" |
409 |
-HOMEPAGE="http://pypy.org/" |
410 |
-SRC_URI="https://bitbucket.org/pypy/pypy/downloads/${MY_P}-src.tar.bz2 |
411 |
- amd64? ( |
412 |
- jit? ( ${BINHOST}/${P}-amd64+bzip2+jit+ncurses.tar.lz ) |
413 |
- !jit? ( ${BINHOST}/${P}-amd64+bzip2+ncurses.tar.lz ) |
414 |
- ) |
415 |
- x86? ( |
416 |
- cpu_flags_x86_sse2? ( |
417 |
- jit? ( ${BINHOST}/${P}-x86+bzip2+jit+ncurses+sse2.tar.lz ) |
418 |
- !jit? ( ${BINHOST}/${P}-x86+bzip2+ncurses+sse2.tar.lz ) |
419 |
- ) |
420 |
- !cpu_flags_x86_sse2? ( |
421 |
- !jit? ( ${BINHOST}/${P}-x86+bzip2+ncurses.r1.tar.lz ) |
422 |
- ) |
423 |
- )" |
424 |
- |
425 |
-# Supported variants |
426 |
-REQUIRED_USE="x86? ( !cpu_flags_x86_sse2? ( !jit ) )" |
427 |
- |
428 |
-LICENSE="MIT" |
429 |
-# pypy3 -c 'import sysconfig; print(sysconfig.get_config_var("SOABI"))' |
430 |
-SLOT="0/71-py36" |
431 |
-KEYWORDS="~amd64 ~x86" |
432 |
-IUSE="gdbm +jit libressl sqlite cpu_flags_x86_sse2 test tk" |
433 |
- |
434 |
-RDEPEND=" |
435 |
- app-arch/bzip2:0/1 |
436 |
- dev-libs/expat:0/0 |
437 |
- dev-libs/libffi:0/7 |
438 |
- sys-devel/gcc:* |
439 |
- >=sys-libs/glibc-2.28 |
440 |
- sys-libs/ncurses:0/6 |
441 |
- sys-libs/zlib:0/1 |
442 |
- gdbm? ( sys-libs/gdbm:0= ) |
443 |
- !libressl? ( dev-libs/openssl:0=[-bindist] ) |
444 |
- libressl? ( dev-libs/libressl:0= ) |
445 |
- sqlite? ( dev-db/sqlite:3= ) |
446 |
- tk? ( |
447 |
- dev-lang/tk:0= |
448 |
- dev-tcltk/tix:0= |
449 |
- ) |
450 |
- !dev-python/pypy3:0" |
451 |
-DEPEND="${RDEPEND} |
452 |
- app-arch/lzip |
453 |
- app-arch/xz-utils |
454 |
- test? ( ${PYTHON_DEPS} )" |
455 |
- |
456 |
-S=${WORKDIR}/${MY_P}-src |
457 |
- |
458 |
-QA_PREBUILT=" |
459 |
- usr/lib/pypy3.6/pypy3-c |
460 |
- usr/lib/pypy3.6/libpypy3-c.so" |
461 |
- |
462 |
-src_prepare() { |
463 |
- eapply "${FILESDIR}/7.0.0-gentoo-path.patch" |
464 |
- eapply "${FILESDIR}/1.9-distutils.unixccompiler.UnixCCompiler.runtime_library_dir_option.patch" |
465 |
- eapply "${FILESDIR}"/7.0.0_all_distutils_cxx.patch |
466 |
- |
467 |
- sed -e "s^@EPREFIX@^${EPREFIX}^" \ |
468 |
- -i lib-python/3/distutils/command/install.py || die |
469 |
- |
470 |
- # apply CPython stdlib patches |
471 |
- pushd lib-python/3 > /dev/null || die |
472 |
- eapply "${FILESDIR}"/python-3.5-distutils-OO-build.patch |
473 |
- popd > /dev/null || die |
474 |
- |
475 |
- eapply_user |
476 |
-} |
477 |
- |
478 |
-src_compile() { |
479 |
- # Tadaam! PyPy compiled! |
480 |
- mv "${WORKDIR}"/${P}*/{libpypy3-c.so,pypy3-c} . || die |
481 |
- mv "${WORKDIR}"/${P}*/include/*.h include/ || die |
482 |
- mv pypy/module/cpyext/include/*.h include/ || die |
483 |
- mv pypy/module/cpyext/parse/*.h include/ || die |
484 |
- |
485 |
- pax-mark m pypy3-c libpypy3-c.so |
486 |
- |
487 |
- einfo "Generating caches and CFFI modules ..." |
488 |
- |
489 |
- # Generate Grammar and PatternGrammar pickles. |
490 |
- ./pypy3-c -c "import lib2to3.pygram, lib2to3.patcomp; lib2to3.patcomp.PatternCompiler()" \ |
491 |
- || die "Generation of Grammar and PatternGrammar pickles failed" |
492 |
- |
493 |
- # Generate cffi modules |
494 |
- # Please keep in sync with pypy/tool/build_cffi_imports.py! |
495 |
-#cffi_build_scripts = { |
496 |
-# "sqlite3": "_sqlite3_build.py", |
497 |
-# "audioop": "_audioop_build.py", |
498 |
-# "tk": "_tkinter/tklib_build.py", |
499 |
-# "curses": "_curses_build.py" if sys.platform != "win32" else None, |
500 |
-# "syslog": "_syslog_build.py" if sys.platform != "win32" else None, |
501 |
-# "_gdbm": "_gdbm_build.py" if sys.platform != "win32" else None, |
502 |
-# "pwdgrp": "_pwdgrp_build.py" if sys.platform != "win32" else None, |
503 |
-# "resource": "_resource_build.py" if sys.platform != "win32" else None, |
504 |
-# "lzma": "_lzma_build.py", |
505 |
-# "_decimal": "_decimal_build.py", |
506 |
-# "ssl": "_ssl_build.py", |
507 |
-# "_blake2": "_blake2/_blake2_build.py", |
508 |
-# "_sha3": "_sha3/_sha3_build.py", |
509 |
- cffi_targets=( blake2/_blake2 sha3/_sha3 ssl |
510 |
- audioop curses syslog pwdgrp resource lzma decimal ) |
511 |
- use gdbm && cffi_targets+=( gdbm ) |
512 |
- use sqlite && cffi_targets+=( sqlite3 ) |
513 |
- use tk && cffi_targets+=( tkinter/tklib ) |
514 |
- |
515 |
- einfo "Please disregard the import errors during CFFI cache generation." |
516 |
- einfo "They come from modules not built yet." |
517 |
- |
518 |
- local t |
519 |
- # all modules except tkinter output to . |
520 |
- # tkinter outputs to the correct dir ... |
521 |
- cd lib_pypy || die |
522 |
- for t in "${cffi_targets[@]}"; do |
523 |
- # tkinter doesn't work via -m |
524 |
- ../pypy3-c "_${t}_build.py" || die "Failed to build CFFI bindings for ${t}" |
525 |
- done |
526 |
- |
527 |
- # Cleanup temporary objects |
528 |
- find -name "_cffi_*.[co]" -delete || die |
529 |
- find -type d -empty -delete || die |
530 |
-} |
531 |
- |
532 |
-src_test() { |
533 |
- # (unset) |
534 |
- local -x PYTHONDONTWRITEBYTECODE= |
535 |
- |
536 |
- # Test runner requires Python 2 too. However, it spawns PyPy3 |
537 |
- # internally so that we end up testing the correct interpreter. |
538 |
- "${PYTHON}" ./pypy/test_all.py --pypy=./pypy3-c -vv lib-python || die |
539 |
-} |
540 |
- |
541 |
-src_install() { |
542 |
- local dest=/usr/lib/pypy3.6 |
543 |
- einfo "Installing PyPy ..." |
544 |
- exeinto "${dest}" |
545 |
- doexe pypy3-c libpypy3-c.so |
546 |
- pax-mark m "${ED%/}${dest}/pypy3-c" "${ED%/}${dest}/libpypy3-c.so" |
547 |
- insinto "${dest}" |
548 |
- # preserve mtimes to avoid obsoleting caches |
549 |
- insopts -p |
550 |
- doins -r include lib_pypy lib-python |
551 |
- dosym ../lib/pypy3.6/pypy3-c /usr/bin/pypy3 |
552 |
- dodoc README.rst |
553 |
- |
554 |
- if ! use gdbm; then |
555 |
- rm -r "${ED%/}${dest}"/lib_pypy/_gdbm* || die |
556 |
- fi |
557 |
- if ! use sqlite; then |
558 |
- rm -r "${ED%/}${dest}"/lib-python/*3/sqlite3 \ |
559 |
- "${ED%/}${dest}"/lib_pypy/_sqlite3* \ |
560 |
- "${ED%/}${dest}"/lib-python/*3/test/test_sqlite.py || die |
561 |
- fi |
562 |
- if ! use tk; then |
563 |
- rm -r "${ED%/}${dest}"/lib-python/*3/{idlelib,tkinter} \ |
564 |
- "${ED%/}${dest}"/lib_pypy/_tkinter \ |
565 |
- "${ED%/}${dest}"/lib-python/*3/test/test_{tcl,tk,ttk*}.py || die |
566 |
- fi |
567 |
- |
568 |
- einfo "Generating caches and byte-compiling ..." |
569 |
- |
570 |
- local -x PYTHON=${ED%/}${dest}/pypy3-c |
571 |
- # we can't use eclass function since PyPy is dumb and always gives |
572 |
- # paths relative to the interpreter |
573 |
- local PYTHON_SITEDIR=${EPREFIX}/usr/lib/pypy3.6/site-packages |
574 |
- python_export pypy3 EPYTHON |
575 |
- |
576 |
- echo "EPYTHON='${EPYTHON}'" > epython.py || die |
577 |
- python_domodule epython.py |
578 |
- |
579 |
- einfo "Byte-compiling Python standard library..." |
580 |
- |
581 |
- # compile the installed modules |
582 |
- python_optimize "${ED%/}${dest}" |
583 |
-} |
584 |
|
585 |
diff --git a/dev-python/pypy3-bin/pypy3-bin-7.1.1.ebuild b/dev-python/pypy3-bin/pypy3-bin-7.1.1.ebuild |
586 |
deleted file mode 100644 |
587 |
index 0f8954a4f84..00000000000 |
588 |
--- a/dev-python/pypy3-bin/pypy3-bin-7.1.1.ebuild |
589 |
+++ /dev/null |
590 |
@@ -1,188 +0,0 @@ |
591 |
-# Copyright 1999-2019 Gentoo Authors |
592 |
-# Distributed under the terms of the GNU General Public License v2 |
593 |
- |
594 |
-EAPI=7 |
595 |
- |
596 |
-# Test runner needs Python 2. |
597 |
-PYTHON_COMPAT=( python2_7 pypy ) |
598 |
-inherit pax-utils python-any-r1 unpacker |
599 |
- |
600 |
-BINHOST="https://dev.gentoo.org/~mgorny/dist/pypy3-bin/${PV}" |
601 |
-MY_P=pypy3.6-v${PV} |
602 |
- |
603 |
-DESCRIPTION="A fast, compliant alternative implementation of Python 3.6 (binary package)" |
604 |
-HOMEPAGE="http://pypy.org/" |
605 |
-SRC_URI="https://bitbucket.org/pypy/pypy/downloads/${MY_P}-src.tar.bz2 |
606 |
- amd64? ( |
607 |
- jit? ( ${BINHOST}/${P}-amd64+bzip2+jit+ncurses.tar.lz ) |
608 |
- !jit? ( ${BINHOST}/${P}-amd64+bzip2+ncurses.tar.lz ) |
609 |
- ) |
610 |
- x86? ( |
611 |
- cpu_flags_x86_sse2? ( |
612 |
- jit? ( ${BINHOST}/${P}-x86+bzip2+jit+ncurses+sse2.tar.lz ) |
613 |
- !jit? ( ${BINHOST}/${P}-x86+bzip2+ncurses+sse2.tar.lz ) |
614 |
- ) |
615 |
- !cpu_flags_x86_sse2? ( |
616 |
- !jit? ( ${BINHOST}/${P}-x86+bzip2+ncurses.tar.lz ) |
617 |
- ) |
618 |
- )" |
619 |
- |
620 |
-# Supported variants |
621 |
-REQUIRED_USE="x86? ( !cpu_flags_x86_sse2? ( !jit ) )" |
622 |
- |
623 |
-LICENSE="MIT" |
624 |
-# pypy3 -c 'import sysconfig; print(sysconfig.get_config_var("SOABI"))' |
625 |
-SLOT="0/71-py36" |
626 |
-KEYWORDS="~amd64 ~x86" |
627 |
-IUSE="gdbm +jit libressl sqlite cpu_flags_x86_sse2 test tk" |
628 |
- |
629 |
-RDEPEND=" |
630 |
- app-arch/bzip2:0/1 |
631 |
- dev-libs/expat:0/0 |
632 |
- dev-libs/libffi:0/7 |
633 |
- sys-devel/gcc:* |
634 |
- >=sys-libs/glibc-2.28 |
635 |
- sys-libs/ncurses:0/6 |
636 |
- sys-libs/zlib:0/1 |
637 |
- gdbm? ( sys-libs/gdbm:0= ) |
638 |
- !libressl? ( dev-libs/openssl:0=[-bindist] ) |
639 |
- libressl? ( dev-libs/libressl:0= ) |
640 |
- sqlite? ( dev-db/sqlite:3= ) |
641 |
- tk? ( |
642 |
- dev-lang/tk:0= |
643 |
- dev-tcltk/tix:0= |
644 |
- ) |
645 |
- !dev-python/pypy3:0" |
646 |
-DEPEND="${RDEPEND} |
647 |
- app-arch/lzip |
648 |
- app-arch/xz-utils |
649 |
- test? ( ${PYTHON_DEPS} )" |
650 |
- |
651 |
-S=${WORKDIR}/${MY_P}-src |
652 |
- |
653 |
-QA_PREBUILT=" |
654 |
- usr/lib/pypy3.6/pypy3-c |
655 |
- usr/lib/pypy3.6/libpypy3-c.so" |
656 |
- |
657 |
-src_prepare() { |
658 |
- eapply "${FILESDIR}/7.0.0-gentoo-path.patch" |
659 |
- eapply "${FILESDIR}/1.9-distutils.unixccompiler.UnixCCompiler.runtime_library_dir_option.patch" |
660 |
- eapply "${FILESDIR}"/7.0.0_all_distutils_cxx.patch |
661 |
- |
662 |
- sed -e "s^@EPREFIX@^${EPREFIX}^" \ |
663 |
- -i lib-python/3/distutils/command/install.py || die |
664 |
- |
665 |
- # apply CPython stdlib patches |
666 |
- pushd lib-python/3 > /dev/null || die |
667 |
- eapply "${FILESDIR}"/python-3.5-distutils-OO-build.patch |
668 |
- popd > /dev/null || die |
669 |
- |
670 |
- eapply_user |
671 |
-} |
672 |
- |
673 |
-src_compile() { |
674 |
- # Tadaam! PyPy compiled! |
675 |
- mv "${WORKDIR}"/${P}*/{libpypy3-c.so,pypy3-c} . || die |
676 |
- mv "${WORKDIR}"/${P}*/include/*.h include/ || die |
677 |
- mv pypy/module/cpyext/include/*.h include/ || die |
678 |
- mv pypy/module/cpyext/parse/*.h include/ || die |
679 |
- |
680 |
- pax-mark m pypy3-c libpypy3-c.so |
681 |
- |
682 |
- einfo "Generating caches and CFFI modules ..." |
683 |
- |
684 |
- # Generate Grammar and PatternGrammar pickles. |
685 |
- ./pypy3-c -c "import lib2to3.pygram, lib2to3.patcomp; lib2to3.patcomp.PatternCompiler()" \ |
686 |
- || die "Generation of Grammar and PatternGrammar pickles failed" |
687 |
- |
688 |
- # Generate cffi modules |
689 |
- # Please keep in sync with pypy/tool/build_cffi_imports.py! |
690 |
-#cffi_build_scripts = { |
691 |
-# "sqlite3": "_sqlite3_build.py", |
692 |
-# "audioop": "_audioop_build.py", |
693 |
-# "tk": "_tkinter/tklib_build.py", |
694 |
-# "curses": "_curses_build.py" if sys.platform != "win32" else None, |
695 |
-# "syslog": "_syslog_build.py" if sys.platform != "win32" else None, |
696 |
-# "_gdbm": "_gdbm_build.py" if sys.platform != "win32" else None, |
697 |
-# "pwdgrp": "_pwdgrp_build.py" if sys.platform != "win32" else None, |
698 |
-# "resource": "_resource_build.py" if sys.platform != "win32" else None, |
699 |
-# "lzma": "_lzma_build.py", |
700 |
-# "_decimal": "_decimal_build.py", |
701 |
-# "ssl": "_ssl_build.py", |
702 |
-# "_blake2": "_blake2/_blake2_build.py", |
703 |
-# "_sha3": "_sha3/_sha3_build.py", |
704 |
- cffi_targets=( blake2/_blake2 sha3/_sha3 ssl |
705 |
- audioop curses syslog pwdgrp resource lzma decimal ) |
706 |
- use gdbm && cffi_targets+=( gdbm ) |
707 |
- use sqlite && cffi_targets+=( sqlite3 ) |
708 |
- use tk && cffi_targets+=( tkinter/tklib ) |
709 |
- |
710 |
- einfo "Please disregard the import errors during CFFI cache generation." |
711 |
- einfo "They come from modules not built yet." |
712 |
- |
713 |
- local t |
714 |
- # all modules except tkinter output to . |
715 |
- # tkinter outputs to the correct dir ... |
716 |
- cd lib_pypy || die |
717 |
- for t in "${cffi_targets[@]}"; do |
718 |
- # tkinter doesn't work via -m |
719 |
- ../pypy3-c "_${t}_build.py" || die "Failed to build CFFI bindings for ${t}" |
720 |
- done |
721 |
- |
722 |
- # Cleanup temporary objects |
723 |
- find -name "_cffi_*.[co]" -delete || die |
724 |
- find -type d -empty -delete || die |
725 |
-} |
726 |
- |
727 |
-src_test() { |
728 |
- # (unset) |
729 |
- local -x PYTHONDONTWRITEBYTECODE= |
730 |
- |
731 |
- # Test runner requires Python 2 too. However, it spawns PyPy3 |
732 |
- # internally so that we end up testing the correct interpreter. |
733 |
- "${PYTHON}" ./pypy/test_all.py --pypy=./pypy3-c -vv lib-python || die |
734 |
-} |
735 |
- |
736 |
-src_install() { |
737 |
- local dest=/usr/lib/pypy3.6 |
738 |
- einfo "Installing PyPy ..." |
739 |
- exeinto "${dest}" |
740 |
- doexe pypy3-c libpypy3-c.so |
741 |
- pax-mark m "${ED%/}${dest}/pypy3-c" "${ED%/}${dest}/libpypy3-c.so" |
742 |
- insinto "${dest}" |
743 |
- # preserve mtimes to avoid obsoleting caches |
744 |
- insopts -p |
745 |
- doins -r include lib_pypy lib-python |
746 |
- dosym ../lib/pypy3.6/pypy3-c /usr/bin/pypy3 |
747 |
- dodoc README.rst |
748 |
- |
749 |
- if ! use gdbm; then |
750 |
- rm -r "${ED%/}${dest}"/lib_pypy/_gdbm* || die |
751 |
- fi |
752 |
- if ! use sqlite; then |
753 |
- rm -r "${ED%/}${dest}"/lib-python/*3/sqlite3 \ |
754 |
- "${ED%/}${dest}"/lib_pypy/_sqlite3* \ |
755 |
- "${ED%/}${dest}"/lib-python/*3/test/test_sqlite.py || die |
756 |
- fi |
757 |
- if ! use tk; then |
758 |
- rm -r "${ED%/}${dest}"/lib-python/*3/{idlelib,tkinter} \ |
759 |
- "${ED%/}${dest}"/lib_pypy/_tkinter \ |
760 |
- "${ED%/}${dest}"/lib-python/*3/test/test_{tcl,tk,ttk*}.py || die |
761 |
- fi |
762 |
- |
763 |
- einfo "Generating caches and byte-compiling ..." |
764 |
- |
765 |
- local -x PYTHON=${ED%/}${dest}/pypy3-c |
766 |
- # we can't use eclass function since PyPy is dumb and always gives |
767 |
- # paths relative to the interpreter |
768 |
- local PYTHON_SITEDIR=${EPREFIX}/usr/lib/pypy3.6/site-packages |
769 |
- python_export pypy3 EPYTHON |
770 |
- |
771 |
- echo "EPYTHON='${EPYTHON}'" > epython.py || die |
772 |
- python_domodule epython.py |
773 |
- |
774 |
- einfo "Byte-compiling Python standard library..." |
775 |
- |
776 |
- # compile the installed modules |
777 |
- python_optimize "${ED%/}${dest}" |
778 |
-} |