1 |
commit: 65d59639dae7010c3fcd22e1ba0968fc3d07fe2b |
2 |
Author: Michał Górny <mgorny <AT> gentoo <DOT> org> |
3 |
AuthorDate: Sun Oct 15 09:13:50 2017 +0000 |
4 |
Commit: Michał Górny <mgorny <AT> gentoo <DOT> org> |
5 |
CommitDate: Sun Oct 15 09:38:00 2017 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=65d59639 |
7 |
|
8 |
dev-python/pypy3-bin: Drop old |
9 |
|
10 |
dev-python/pypy3-bin/Manifest | 12 - |
11 |
.../pypy3-bin/files/5.2.0-distutils-c++.patch | 284 ----------------- |
12 |
.../pypy3-bin/files/5.7.1_all_distutils_cxx.patch | 342 --------------------- |
13 |
dev-python/pypy3-bin/metadata.xml | 3 - |
14 |
dev-python/pypy3-bin/pypy3-bin-5.5.0_alpha.ebuild | 200 ------------ |
15 |
dev-python/pypy3-bin/pypy3-bin-5.7.1-r1.ebuild | 171 ----------- |
16 |
6 files changed, 1012 deletions(-) |
17 |
|
18 |
diff --git a/dev-python/pypy3-bin/Manifest b/dev-python/pypy3-bin/Manifest |
19 |
index c82571c44c1..fdeaa1135c4 100644 |
20 |
--- a/dev-python/pypy3-bin/Manifest |
21 |
+++ b/dev-python/pypy3-bin/Manifest |
22 |
@@ -1,12 +1,3 @@ |
23 |
-DIST pypy3-bin-5.5.0_alpha-amd64+bzip2+jit+ncurses+shadowstack.tar.lz 10860820 SHA256 46437ffdc3327b11fb116071ec8bb5c93aa94ac143a7105cadb678be708faeb5 SHA512 ed93e8452c82e627699aa876cfa55d2fd84d7ec7c6698e2a20bda2a5bb564def68b51a2e62ca45a36f88805cbca453b0a8a6565016428c4eef22a5539bb24647 WHIRLPOOL 858befe94e009628cee4e8527aaaa1e8e92fe264ff91b382fed74ba31314eccf914c403b376792eec322bcead140e8159d255b265bc88832accb3d65d16fd78c |
24 |
-DIST pypy3-bin-5.5.0_alpha-amd64+bzip2+jit+ncurses.tar.lz 11610069 SHA256 a400bd9c2df450647278dec93d397e4d040fd058f78309e8cdaff8b0792b8c01 SHA512 e0dca44387c03306691c63263aae7d484a5244b686cfd57315d7c4bd630fd5fba888d8cb57855d3f84c9bda576194597e4048877990456812f747d7d099b5819 WHIRLPOOL 3f61e0b02bbfc77a413fe38aca59c626857b1b8a05b952e7a832e4d3cc20dd5d98d9173161d08cd92587e2a7b44a2a55ba61f516c632611cb4d16a20f3eb4e74 |
25 |
-DIST pypy3-bin-5.5.0_alpha-amd64+bzip2+ncurses.tar.lz 6243046 SHA256 34ae3b199194a90f0867e95306b6530faa3acafb9dc9ef077ba4e229f3a5d0de SHA512 4fdae8644c40734281d81adb5c8273a0f2429c47bff8672a7f98988195c6e9ab82d9a1443e2d1c1bc2ca75d471c112ac40ac403e75808d8610dce94fee15031b WHIRLPOOL ca2c5b4f0334f1193ef5cd6bf7ebe9034fbd176f0ce34b6302125c6e2b175e69129ca53d21ef34327bb064cf90af907c10bd81d62ccb429298020043a41fdfa0 |
26 |
-DIST pypy3-bin-5.5.0_alpha-x86+bzip2+jit+ncurses+shadowstack+sse2.tar.lz 8656783 SHA256 52bff882b65d4664661c70657c927d69cbc0b9377c7d0ae20ed8ca562d8e13f4 SHA512 6ae588077d92d1c4d494e2b657a3d963989e3f3cf2d689ec4cf460f196d69234d13b88160ebb46334af0733f5ec13720abb0d2bc3184c6744b9218a8a5f6440a WHIRLPOOL 81593ba510a71cc7ef47f3013e89e468bb5671da32a0ca5cdbfc1579cd2df90ce3b53ed59f2974243bc1b21eb8ea8d509d66ea4d2539c56f8a15ba9a3e7c6127 |
27 |
-DIST pypy3-bin-5.5.0_alpha-x86+bzip2+jit+ncurses+sse2.tar.lz 9549100 SHA256 fdd95b1fb91d669e1861b2dff52b97af0d01aaedf61eb11f07c8f92cd398c7f6 SHA512 2ac8cb894cafae8da81bddb601185941b42933aa41bda8d1696eb70ca22cbeaa0c23385e4a4cd640c46f9e301acfc2f9bc89adaf5a7f5cbef4bc23ca8af550bb WHIRLPOOL e4c21be6b52468135ff6e53434a8ae8c0450880d0f5c8d37bdc18a99f9ceb0ae101c82b8a7a6ae2088297f9dbfa7146fcf80a24948dd3316d56f0f798cc7ecec |
28 |
-DIST pypy3-bin-5.5.0_alpha-x86+bzip2+ncurses+sse2.tar.lz 5231919 SHA256 6a9848bc2d1d948a91bc15ce20768bc7024726ec7afdd2767bfba25926a35c7f SHA512 fbdc955b1c2873d07e8ad36dd697fbb21932ac50726e76fed20da1fca218b329f18c81b8b4a65cd7ece26091859529d5bb56c7ed2efaf14ae8d9988581d88d9b WHIRLPOOL 08ffd98122e4745af4e785ebb986cd7d185472ec0879bb9dc6070b14de6d35e4177e35a85326468329a06617df03880744e23a6bef825f67d40476c92c7d430e |
29 |
-DIST pypy3-bin-5.5.0_alpha-x86+bzip2+ncurses.tar.lz 5232239 SHA256 d808aa66ecd5b3d868554ad29b0eee3948e3de69390826bcb5e6b8ceb2408037 SHA512 5e107304537855f459cc7bee92d3b2d05e16f2421d2249205c34f40f1f9415ca657f3e0842c79de98fed732e0a2752b280b44880f96eeeaa0d50d4b4bf2c525c WHIRLPOOL 562fe0c00aeb83a74d9f1ccba4ffed70b5efa6592ef04c82ea06c38afc560e97aa02b835de8b69925690149c1d6803ecfbcad7eefd59bdf4462bdbbbf82c2577 |
30 |
-DIST pypy3-bin-5.7.1-amd64+bzip2+jit+ncurses.tar.lz 10329767 SHA256 041d6b6af48ec4a2de0062a2ae48a3d2a8e827d450b76fc4232f4a9eca8cbc47 SHA512 a5959d4bd5d267ea0386e4fab4b86b83f7597aaa3174281f15f180e0c83125af1437c0a693b0d534929c7199df5958a5f48867c72d1ce24494b2238523cde2aa WHIRLPOOL 8eef898eac108726b89751e6af80c112f46800ab1dd4efad118e71adb6c7cbaccbe46360da3be7d5ad5702262a2e377bfc530b7519fc38532123884c84e0c1ee |
31 |
-DIST pypy3-bin-5.7.1-amd64+bzip2+ncurses.tar.lz 6352387 SHA256 0243a016a7b836af72e6e1172f2a4516b9705169a9ba2318093b5c3005917766 SHA512 a63b02dfc11b7675bd4ccceb58801aeb1fd40d0245196dd7fa9f646e4618f46c8e6c4d95072c6432381064d37bc13cb74fbd383d19f8769f069827a8969e7a95 WHIRLPOOL f09b82a6c8a4dada7597bfbe0b2ecd07d90d724eae3d2cc6f35a69c0f219b420236ed8ad37024ad8f9516d729389cbe919f58a48cf1aa323c3a74220c62b8aa3 |
32 |
DIST pypy3-bin-5.8.0-amd64+bzip2+jit+ncurses.tar.lz 10706804 SHA256 fd8e3550426d747f65d52fb2edbe5b9133c1946eed5f1ada5a454fe5a99b489f SHA512 38e46503ba50987a36b68e7d6316b64a00c1e2fa0d2d0b0e0e517bbfa96cb777522346d2c4a78cc7bdf44fa237453dc97867f9323785ba38b21c1f1058d5e701 WHIRLPOOL 59ecc9f9c5d4a29819d0911cc1402f38bd9708ec3e28ba90cb33159b88e11a150a33390c2a73e26831de578ec77598018945e001a1bc3e8f2659b17743a3cdf6 |
33 |
DIST pypy3-bin-5.8.0-amd64+bzip2+ncurses.tar.lz 6626453 SHA256 f840fba90a52e0bfaf9f7f3197f47823154709b86b33dbe61df1f721d8eb46ef SHA512 51d418668c48f8e2d740264855e193353900d56893c0fc81de09e8fab338a36a696a725dd3387ee1d626f82e8319b797bfa4957a5cc8f0b11610b3e6ece67539 WHIRLPOOL 45348517cb0bf8e98ac53149314288716cf8ee972505c354192a46b6472fff694cc037689f2f61707396ed55b9baebe35fa4e99695789f93cb8edeaa08e71fe2 |
34 |
DIST pypy3-bin-5.9.0-amd64+bzip2+jit+ncurses.tar.lz 10510722 SHA256 e970e4750897e6fb2a703511adc863611fe4a9da1f0190b8b6231babbd56bc02 SHA512 659ed24c9f540168203098fc9b6086cc22a42767b55f3dbbf132b11cf8e1bc01a66baac78d7689dcc31d9f06e7f2ecfbda9969c9ba150d5af9c462e480aa288c WHIRLPOOL 4293c2d4912032360513cbfff03ad9271a90802652fc360c199c3469130871d66d8cf48c87a2d72c660f03e0318c8e08efb87fc33973b0c97b964bd61c2726cb |
35 |
@@ -14,8 +5,5 @@ DIST pypy3-bin-5.9.0-amd64+bzip2+ncurses.tar.lz 6589457 SHA256 e9ff832ce9a1d3384 |
36 |
DIST pypy3-bin-5.9.0-x86+bzip2+jit+ncurses+sse2.tar.lz 8595527 SHA256 9d7a4d4b25f1a3f8a7376e5f19dfcbe98753233dee1c14a98d1a19fb7ca553bd SHA512 6d118cf2e9a657dcf719ca5e508b5b4bb2ab7f85ec3597840706b748ea2f6d582ed884fc34697a3ec36e343de4a40b113d7c8749683a53f2dda299a9e106a2f8 WHIRLPOOL 635f45fd92b94042e44d1f81a2b4312b6c0d79ffa776d21532c495501d344d1f5fa5561eba944f797a6c69a7c52ae59d0a2217af6c7f8e54197fc2fd99c4c83e |
37 |
DIST pypy3-bin-5.9.0-x86+bzip2+ncurses+sse2.tar.lz 5654668 SHA256 7d8ced801dc94c0cf19ac580d7ebb21f7ebeae98f3a991ae8a37a925b4fe2669 SHA512 a378159ca39654fbf117e3bd5a0cdcdb23100a21caf837bba5d764b63bf039a791b27d397a6be918a2539d721fc8564f2b10a163df3bae89a4ddb3991ac33ec8 WHIRLPOOL 0e3ab5dacf2bdf5c2e08d21330fd4cad34b5f4424863a999469c53a1b61980fd4307795545f5e735b53aa198634646a11387a753552c66c40dba47599716c2ca |
38 |
DIST pypy3-bin-5.9.0-x86+bzip2+ncurses.tar.lz 5640443 SHA256 13c47cdd603d647e8a5fe0d11a7165abd2599ad7ae2f6bbdd47829785b62f955 SHA512 663fae9004eb7f002b849d4697ef67fb72df33faddfba7272a6d795432ecca4c110dc1fab43617909f962584c7519582f085854f55829ccc63dc988654b6add5 WHIRLPOOL 57a16723235fc3a4e1fcb3defb68cecfa0a78f090750c6a3001904d68e1240094659828affc4d34113e81bb7aa5aed5865e4da6afb7aa3a16d815c26fd83c8c5 |
39 |
-DIST pypy3-v5.7.1-src.tar.bz2 28811162 SHA256 40ece0145282980ac121390f13709404c0532896507d5767496381180b631bd0 SHA512 f8ead8214ad7d89fe80e24d97b13ece7f2c80b2f11446257a2eab0e3025fc7d8fec26474b0e9eb2b2e3ccd629532dd062829459361b601add12e40793bd5aa60 WHIRLPOOL 180a5cb39c9a5e3840f4940463dd9cccf44486f11a657d2ac644d1eac4561068f08905fdadc495918fb0ceaf018d4b85a3e5756ca6d99a020310b46bdb16ef87 |
40 |
DIST pypy3-v5.8.0-src.tar.bz2 28986883 SHA256 9d090127335c3c0fd2b14c8835bf91752e62756e55ea06aad3353f24a6854223 SHA512 d78b4c899a5643028664365ed973a7b292a8e5b3989cc75203cd381ea3cda7dd73121c574726e23dca86e8364fcfcf42c372c9deee438c805f30d6e1c4ac115a WHIRLPOOL b7567fa21e3ded400a72ec06197184df37e0b5893adfb55622ea9afb668bfbda7ebbecd9b80660efef42f160838966d103c4181a9b07355e873981b35f4bf104 |
41 |
DIST pypy3-v5.9.0-src.tar.bz2 29055111 SHA256 a014f47f50a1480f871a0b82705f904b38c93c4ca069850eb37653fedafb1b97 SHA512 3d5384d644fdd1bc8b95f5747dbd1771ae06eb2cfc7b57be359b8bf40177676afd097620d0cb9d9000c40d8cce075cfa6bfd92de987d3dd927c04d7d595dc5bd WHIRLPOOL e0936d56c64c3c077910c4713295010ec3e0fabebe654115ddf07407884d1564db7de2f85bcedf1226449c516085f3e4814a2c523f0d48e3ad8ac21150a93a72 |
42 |
-DIST pypy3.3-v5.5.0-alpha-src.tar.bz2 25122033 SHA256 d5591c34d77253e9ed57d182b6f49585b95f7c09c3e121f0e8630e5a7e75ab5f SHA512 b2cf9700e45c452293297edffe08e572dffc3c567026b4b5d9165c1ba1b4d858ffc8a6754f5f28781020016c36440e5c02d07562d075b12444c9c32ea5dd2168 WHIRLPOOL 6bde174969413c55d6d077cd14e737c4f034f19935536af1bffaf3a1caa456d2bf6850760a18c274ad99089bd5ab7331d7d185f914cd6c69f708abf857d35df3 |
43 |
-DIST python-gentoo-patches-3.3.5-0.tar.xz 12892 SHA256 a7240de9598033cb40f8f273d8104d4e2b1dcaea028d45ac28efaa3c680ff6f7 SHA512 27eef4c2b3f631b000db3f6a5c426d9b498d63a08fe82b1ab7c2c010fb72208109461a5f008d47703852526655b70a734ea95be8742897026db5750bb9cc9d16 WHIRLPOOL edab9222d7da94cab3b1de0e1a27c6c7dbd49194b813a0a1cf9e532063029c4e4f19151c9f4878eeabed3168ff1f97eae7f008280c7ed2897fc14c5516c68d7e |
44 |
|
45 |
diff --git a/dev-python/pypy3-bin/files/5.2.0-distutils-c++.patch b/dev-python/pypy3-bin/files/5.2.0-distutils-c++.patch |
46 |
deleted file mode 100644 |
47 |
index 1251694107d..00000000000 |
48 |
--- a/dev-python/pypy3-bin/files/5.2.0-distutils-c++.patch |
49 |
+++ /dev/null |
50 |
@@ -1,284 +0,0 @@ |
51 |
-From e3afe6721897c8de830055621313bc0659518415 Mon Sep 17 00:00:00 2001 |
52 |
-From: =?UTF-8?q?Micha=C5=82=20G=C3=B3rny?= <mgorny@g.o> |
53 |
-Date: Thu, 9 Jun 2016 20:48:10 +0200 |
54 |
-Subject: [PATCH] distutils c++ fixes, python3.3 patch updated for pypy3.3 |
55 |
- |
56 |
---- |
57 |
- lib-python/3/_osx_support.py | 10 +++--- |
58 |
- lib-python/3/distutils/cygwinccompiler.py | 21 +++++++++-- |
59 |
- lib-python/3/distutils/emxccompiler.py | 14 ++++++-- |
60 |
- lib-python/3/distutils/sysconfig_cpython.py | 25 ++++++++++--- |
61 |
- lib-python/3/distutils/unixccompiler.py | 54 ++++++++++++++++------------- |
62 |
- 5 files changed, 83 insertions(+), 41 deletions(-) |
63 |
- |
64 |
-diff --git a/lib-python/3/_osx_support.py b/lib-python/3/_osx_support.py |
65 |
-index 50b2d17..1d19599 100644 |
66 |
---- a/lib-python/3/_osx_support.py |
67 |
-+++ b/lib-python/3/_osx_support.py |
68 |
-@@ -14,13 +14,13 @@ __all__ = [ |
69 |
- # configuration variables that may contain universal build flags, |
70 |
- # like "-arch" or "-isdkroot", that may need customization for |
71 |
- # the user environment |
72 |
--_UNIVERSAL_CONFIG_VARS = ('CFLAGS', 'LDFLAGS', 'CPPFLAGS', 'BASECFLAGS', |
73 |
-- 'BLDSHARED', 'LDSHARED', 'CC', 'CXX', |
74 |
-- 'PY_CFLAGS', 'PY_LDFLAGS', 'PY_CPPFLAGS', |
75 |
-- 'PY_CORE_CFLAGS') |
76 |
-+_UNIVERSAL_CONFIG_VARS = ('CFLAGS', 'CXXFLAGS', 'LDFLAGS', 'CPPFLAGS', |
77 |
-+ 'BASECFLAGS', 'BLDSHARED', 'LDSHARED', 'LDCXXSHARED', |
78 |
-+ 'CC', 'CXX', 'PY_CFLAGS', 'PY_LDFLAGS', |
79 |
-+ 'PY_CPPFLAGS', 'PY_CORE_CFLAGS') |
80 |
- |
81 |
- # configuration variables that may contain compiler calls |
82 |
--_COMPILER_CONFIG_VARS = ('BLDSHARED', 'LDSHARED', 'CC', 'CXX') |
83 |
-+_COMPILER_CONFIG_VARS = ('BLDSHARED', 'LDSHARED', 'LDCXXSHARED', 'CC', 'CXX') |
84 |
- |
85 |
- # prefix added to original configuration variable names |
86 |
- _INITPRE = '_OSX_SUPPORT_INITIAL_' |
87 |
-diff --git a/lib-python/3/distutils/cygwinccompiler.py b/lib-python/3/distutils/cygwinccompiler.py |
88 |
-index e0074a1..1b383d3 100644 |
89 |
---- a/lib-python/3/distutils/cygwinccompiler.py |
90 |
-+++ b/lib-python/3/distutils/cygwinccompiler.py |
91 |
-@@ -124,8 +124,10 @@ class CygwinCCompiler(UnixCCompiler): |
92 |
- # dllwrap 2.10.90 is buggy |
93 |
- if self.ld_version >= "2.10.90": |
94 |
- self.linker_dll = "gcc" |
95 |
-+ self.linker_dll_cxx = "g++" |
96 |
- else: |
97 |
- self.linker_dll = "dllwrap" |
98 |
-+ self.linker_dll_cxx = "dllwrap" |
99 |
- |
100 |
- # ld_version >= "2.13" support -shared so use it instead of |
101 |
- # -mdll -static |
102 |
-@@ -139,9 +141,13 @@ class CygwinCCompiler(UnixCCompiler): |
103 |
- self.set_executables(compiler='gcc -mcygwin -O -Wall', |
104 |
- compiler_so='gcc -mcygwin -mdll -O -Wall', |
105 |
- compiler_cxx='g++ -mcygwin -O -Wall', |
106 |
-+ compiler_so_cxx='g++ -mcygwin -mdll -O -Wall', |
107 |
- linker_exe='gcc -mcygwin', |
108 |
- linker_so=('%s -mcygwin %s' % |
109 |
-- (self.linker_dll, shared_option))) |
110 |
-+ (self.linker_dll, shared_option)), |
111 |
-+ linker_exe_cxx='g++ -mcygwin', |
112 |
-+ linker_so_cxx=('%s -mcygwin %s' % |
113 |
-+ (self.linker_dll_cxx, shared_option))) |
114 |
- |
115 |
- # cygwin and mingw32 need different sets of libraries |
116 |
- if self.gcc_version == "2.91.57": |
117 |
-@@ -165,8 +171,12 @@ class CygwinCCompiler(UnixCCompiler): |
118 |
- raise CompileError(msg) |
119 |
- else: # for other files use the C-compiler |
120 |
- try: |
121 |
-- self.spawn(self.compiler_so + cc_args + [src, '-o', obj] + |
122 |
-- extra_postargs) |
123 |
-+ if self.detect_language(src) == 'c++': |
124 |
-+ self.spawn(self.compiler_so_cxx + cc_args + [src, '-o', obj] + |
125 |
-+ extra_postargs) |
126 |
-+ else: |
127 |
-+ self.spawn(self.compiler_so + cc_args + [src, '-o', obj] + |
128 |
-+ extra_postargs) |
129 |
- except DistutilsExecError as msg: |
130 |
- raise CompileError(msg) |
131 |
- |
132 |
-@@ -302,9 +312,14 @@ class Mingw32CCompiler(CygwinCCompiler): |
133 |
- self.set_executables(compiler='gcc%s -O -Wall' % no_cygwin, |
134 |
- compiler_so='gcc%s -mdll -O -Wall' % no_cygwin, |
135 |
- compiler_cxx='g++%s -O -Wall' % no_cygwin, |
136 |
-+ compiler_so_cxx='g++%s -mdll -O -Wall' % no_cygwin, |
137 |
- linker_exe='gcc%s' % no_cygwin, |
138 |
- linker_so='%s%s %s %s' |
139 |
- % (self.linker_dll, no_cygwin, |
140 |
-+ shared_option, entry_point), |
141 |
-+ linker_exe_cxx='g++%s' % no_cygwin, |
142 |
-+ linker_so_cxx='%s%s %s %s' |
143 |
-+ % (self.linker_dll_cxx, no_cygwin, |
144 |
- shared_option, entry_point)) |
145 |
- # Maybe we should also append -mthreads, but then the finished |
146 |
- # dlls need another dll (mingwm10.dll see Mingw32 docs) |
147 |
-diff --git a/lib-python/3/distutils/emxccompiler.py b/lib-python/3/distutils/emxccompiler.py |
148 |
-index 3675f8d..17d2afa 100644 |
149 |
---- a/lib-python/3/distutils/emxccompiler.py |
150 |
-+++ b/lib-python/3/distutils/emxccompiler.py |
151 |
-@@ -63,8 +63,12 @@ class EMXCCompiler (UnixCCompiler): |
152 |
- # XXX optimization, warnings etc. should be customizable. |
153 |
- self.set_executables(compiler='gcc -Zomf -Zmt -O3 -fomit-frame-pointer -mprobe -Wall', |
154 |
- compiler_so='gcc -Zomf -Zmt -O3 -fomit-frame-pointer -mprobe -Wall', |
155 |
-+ compiler_cxx='g++ -Zomf -Zmt -O3 -fomit-frame-pointer -mprobe -Wall', |
156 |
-+ compiler_so_cxx='g++ -Zomf -Zmt -O3 -fomit-frame-pointer -mprobe -Wall', |
157 |
- linker_exe='gcc -Zomf -Zmt -Zcrtdll', |
158 |
-- linker_so='gcc -Zomf -Zmt -Zcrtdll -Zdll') |
159 |
-+ linker_so='gcc -Zomf -Zmt -Zcrtdll -Zdll', |
160 |
-+ linker_exe_cxx='g++ -Zomf -Zmt -Zcrtdll', |
161 |
-+ linker_so_cxx='g++ -Zomf -Zmt -Zcrtdll -Zdll') |
162 |
- |
163 |
- # want the gcc library statically linked (so that we don't have |
164 |
- # to distribute a version dependent on the compiler we have) |
165 |
-@@ -81,8 +85,12 @@ class EMXCCompiler (UnixCCompiler): |
166 |
- raise CompileError(msg) |
167 |
- else: # for other files use the C-compiler |
168 |
- try: |
169 |
-- self.spawn(self.compiler_so + cc_args + [src, '-o', obj] + |
170 |
-- extra_postargs) |
171 |
-+ if self.detect_language(src) == 'c++': |
172 |
-+ self.spawn(self.compiler_so_cxx + cc_args + [src, '-o', obj] + |
173 |
-+ extra_postargs) |
174 |
-+ else: |
175 |
-+ self.spawn(self.compiler_so + cc_args + [src, '-o', obj] + |
176 |
-+ extra_postargs) |
177 |
- except DistutilsExecError as msg: |
178 |
- raise CompileError(msg) |
179 |
- |
180 |
-diff --git a/lib-python/3/distutils/sysconfig_cpython.py b/lib-python/3/distutils/sysconfig_cpython.py |
181 |
-index b947988..3f19020 100644 |
182 |
---- a/lib-python/3/distutils/sysconfig_cpython.py |
183 |
-+++ b/lib-python/3/distutils/sysconfig_cpython.py |
184 |
-@@ -191,9 +191,12 @@ def customize_compiler(compiler): |
185 |
- _osx_support.customize_compiler(_config_vars) |
186 |
- _config_vars['CUSTOMIZED_OSX_COMPILER'] = 'True' |
187 |
- |
188 |
-- (cc, cxx, opt, cflags, ccshared, ldshared, shlib_suffix, ar, ar_flags) = \ |
189 |
-- get_config_vars('CC', 'CXX', 'OPT', 'CFLAGS', |
190 |
-- 'CCSHARED', 'LDSHARED', 'SHLIB_SUFFIX', 'AR', 'ARFLAGS') |
191 |
-+ (cc, cxx, ccshared, ldshared, ldcxxshared, shlib_suffix, ar, ar_flags) = \ |
192 |
-+ get_config_vars('CC', 'CXX', 'CCSHARED', 'LDSHARED', 'LDCXXSHARED', |
193 |
-+ 'SHLIB_SUFFIX', 'AR', 'ARFLAGS') |
194 |
-+ |
195 |
-+ cflags = '' |
196 |
-+ cxxflags = '' |
197 |
- |
198 |
- if 'CC' in os.environ: |
199 |
- newcc = os.environ['CC'] |
200 |
-@@ -208,19 +211,27 @@ def customize_compiler(compiler): |
201 |
- cxx = os.environ['CXX'] |
202 |
- if 'LDSHARED' in os.environ: |
203 |
- ldshared = os.environ['LDSHARED'] |
204 |
-+ if 'LDCXXSHARED' in os.environ: |
205 |
-+ ldcxxshared = os.environ['LDCXXSHARED'] |
206 |
- if 'CPP' in os.environ: |
207 |
- cpp = os.environ['CPP'] |
208 |
- else: |
209 |
- cpp = cc + " -E" # not always |
210 |
- if 'LDFLAGS' in os.environ: |
211 |
- ldshared = ldshared + ' ' + os.environ['LDFLAGS'] |
212 |
-+ ldcxxshared = ldcxxshared + ' ' + os.environ['LDFLAGS'] |
213 |
- if 'CFLAGS' in os.environ: |
214 |
-- cflags = opt + ' ' + os.environ['CFLAGS'] |
215 |
-+ cflags = os.environ['CFLAGS'] |
216 |
- ldshared = ldshared + ' ' + os.environ['CFLAGS'] |
217 |
-+ if 'CXXFLAGS' in os.environ: |
218 |
-+ cxxflags = os.environ['CXXFLAGS'] |
219 |
-+ ldcxxshared = ldcxxshared + ' ' + os.environ['CXXFLAGS'] |
220 |
- if 'CPPFLAGS' in os.environ: |
221 |
- cpp = cpp + ' ' + os.environ['CPPFLAGS'] |
222 |
- cflags = cflags + ' ' + os.environ['CPPFLAGS'] |
223 |
-+ cxxflags = cxxflags + ' ' + os.environ['CPPFLAGS'] |
224 |
- ldshared = ldshared + ' ' + os.environ['CPPFLAGS'] |
225 |
-+ ldcxxshared = ldcxxshared + ' ' + os.environ['CPPFLAGS'] |
226 |
- if 'AR' in os.environ: |
227 |
- ar = os.environ['AR'] |
228 |
- if 'ARFLAGS' in os.environ: |
229 |
-@@ -229,13 +240,17 @@ def customize_compiler(compiler): |
230 |
- archiver = ar + ' ' + ar_flags |
231 |
- |
232 |
- cc_cmd = cc + ' ' + cflags |
233 |
-+ cxx_cmd = cxx + ' ' + cxxflags |
234 |
- compiler.set_executables( |
235 |
- preprocessor=cpp, |
236 |
- compiler=cc_cmd, |
237 |
- compiler_so=cc_cmd + ' ' + ccshared, |
238 |
-- compiler_cxx=cxx, |
239 |
-+ compiler_cxx=cxx_cmd, |
240 |
-+ compiler_so_cxx=cxx_cmd + ' ' + ccshared, |
241 |
- linker_so=ldshared, |
242 |
- linker_exe=cc, |
243 |
-+ linker_so_cxx=ldcxxshared, |
244 |
-+ linker_exe_cxx=cxx, |
245 |
- archiver=archiver) |
246 |
- |
247 |
- compiler.shared_lib_extension = shlib_suffix |
248 |
-diff --git a/lib-python/3/distutils/unixccompiler.py b/lib-python/3/distutils/unixccompiler.py |
249 |
-index 6819d50..19345ee 100644 |
250 |
---- a/lib-python/3/distutils/unixccompiler.py |
251 |
-+++ b/lib-python/3/distutils/unixccompiler.py |
252 |
-@@ -52,14 +52,17 @@ class UnixCCompiler(CCompiler): |
253 |
- # are pretty generic; they will probably have to be set by an outsider |
254 |
- # (eg. using information discovered by the sysconfig about building |
255 |
- # Python extensions). |
256 |
-- executables = {'preprocessor' : None, |
257 |
-- 'compiler' : ["cc"], |
258 |
-- 'compiler_so' : ["cc"], |
259 |
-- 'compiler_cxx' : ["c++"], # pypy: changed, 'cc' is bogus |
260 |
-- 'linker_so' : ["cc", "-shared"], |
261 |
-- 'linker_exe' : ["cc"], |
262 |
-- 'archiver' : ["ar", "-cr"], |
263 |
-- 'ranlib' : None, |
264 |
-+ executables = {'preprocessor' : None, |
265 |
-+ 'compiler' : ["cc"], |
266 |
-+ 'compiler_so' : ["cc"], |
267 |
-+ 'compiler_cxx' : ["c++"], |
268 |
-+ 'compiler_so_cxx' : ["c++"], |
269 |
-+ 'linker_so' : ["cc", "-shared"], |
270 |
-+ 'linker_exe' : ["cc"], |
271 |
-+ 'linker_so_cxx' : ["c++", "-shared"], |
272 |
-+ 'linker_exe_cxx' : ["c++"], |
273 |
-+ 'archiver' : ["ar", "-cr"], |
274 |
-+ 'ranlib' : None, |
275 |
- } |
276 |
- |
277 |
- if sys.platform[:6] == "darwin": |
278 |
-@@ -123,12 +126,19 @@ class UnixCCompiler(CCompiler): |
279 |
- |
280 |
- def _compile(self, obj, src, ext, cc_args, extra_postargs, pp_opts): |
281 |
- compiler_so = self.compiler_so |
282 |
-+ compiler_so_cxx = self.compiler_so_cxx |
283 |
- if sys.platform == 'darwin': |
284 |
- compiler_so = _osx_support.compiler_fixup(compiler_so, |
285 |
- cc_args + extra_postargs) |
286 |
-+ compiler_so_cxx = _osx_support.compiler_fixup(compiler_so_cxx, |
287 |
-+ cc_args + extra_postargs) |
288 |
- try: |
289 |
-- self.spawn(compiler_so + cc_args + [src, '-o', obj] + |
290 |
-- extra_postargs) |
291 |
-+ if self.detect_language(src) == 'c++': |
292 |
-+ self.spawn(compiler_so_cxx + cc_args + [src, '-o', obj] + |
293 |
-+ extra_postargs) |
294 |
-+ else: |
295 |
-+ self.spawn(compiler_so + cc_args + [src, '-o', obj] + |
296 |
-+ extra_postargs) |
297 |
- except DistutilsExecError as msg: |
298 |
- raise CompileError(msg) |
299 |
- |
300 |
-@@ -186,22 +196,16 @@ class UnixCCompiler(CCompiler): |
301 |
- ld_args.extend(extra_postargs) |
302 |
- self.mkpath(os.path.dirname(output_filename)) |
303 |
- try: |
304 |
-- if target_desc == CCompiler.EXECUTABLE: |
305 |
-- linker = self.linker_exe[:] |
306 |
-+ if target_lang == "c++": |
307 |
-+ if target_desc == CCompiler.EXECUTABLE: |
308 |
-+ linker = self.linker_exe_cxx[:] |
309 |
-+ else: |
310 |
-+ linker = self.linker_so_cxx[:] |
311 |
- else: |
312 |
-- linker = self.linker_so[:] |
313 |
-- if target_lang == "c++" and self.compiler_cxx: |
314 |
-- # skip over environment variable settings if /usr/bin/env |
315 |
-- # is used to set up the linker's environment. |
316 |
-- # This is needed on OSX. Note: this assumes that the |
317 |
-- # normal and C++ compiler have the same environment |
318 |
-- # settings. |
319 |
-- i = 0 |
320 |
-- if os.path.basename(linker[0]) == "env": |
321 |
-- i = 1 |
322 |
-- while '=' in linker[i]: |
323 |
-- i += 1 |
324 |
-- linker[i] = self.compiler_cxx[i] |
325 |
-+ if target_desc == CCompiler.EXECUTABLE: |
326 |
-+ linker = self.linker_exe[:] |
327 |
-+ else: |
328 |
-+ linker = self.linker_so[:] |
329 |
- |
330 |
- if sys.platform == 'darwin': |
331 |
- linker = _osx_support.compiler_fixup(linker, ld_args) |
332 |
--- |
333 |
-2.8.4 |
334 |
- |
335 |
|
336 |
diff --git a/dev-python/pypy3-bin/files/5.7.1_all_distutils_cxx.patch b/dev-python/pypy3-bin/files/5.7.1_all_distutils_cxx.patch |
337 |
deleted file mode 100644 |
338 |
index 52a833f29d9..00000000000 |
339 |
--- a/dev-python/pypy3-bin/files/5.7.1_all_distutils_cxx.patch |
340 |
+++ /dev/null |
341 |
@@ -1,342 +0,0 @@ |
342 |
-From b2f2c9d23996d431d606ac7d8ed731a5302b4e97 Mon Sep 17 00:00:00 2001 |
343 |
-From: =?UTF-8?q?Micha=C5=82=20G=C3=B3rny?= <mgorny@g.o> |
344 |
-Date: Tue, 25 Apr 2017 17:42:33 +0200 |
345 |
-Subject: [PATCH] Fancy distutils C++ support, rebased for PyPy3.5 |
346 |
- |
347 |
-https://bugs.python.org/issue1222585 |
348 |
---- |
349 |
- _osx_support.py | 10 +++--- |
350 |
- distutils/cygwinccompiler.py | 21 +++++++++-- |
351 |
- distutils/sysconfig_cpython.py | 25 ++++++++++--- |
352 |
- distutils/sysconfig_pypy.py | 35 +++++++++++++++---- |
353 |
- distutils/unixccompiler.py | 54 ++++++++++++++++------------- |
354 |
- 5 files changed, 100 insertions(+), 45 deletions(-) |
355 |
- |
356 |
-diff --git a/_osx_support.py b/_osx_support.py |
357 |
-index 13fcd8b..0525be1 100644 |
358 |
---- a/_osx_support.py |
359 |
-+++ b/_osx_support.py |
360 |
-@@ -14,13 +14,13 @@ __all__ = [ |
361 |
- # configuration variables that may contain universal build flags, |
362 |
- # like "-arch" or "-isdkroot", that may need customization for |
363 |
- # the user environment |
364 |
--_UNIVERSAL_CONFIG_VARS = ('CFLAGS', 'LDFLAGS', 'CPPFLAGS', 'BASECFLAGS', |
365 |
-- 'BLDSHARED', 'LDSHARED', 'CC', 'CXX', |
366 |
-- 'PY_CFLAGS', 'PY_LDFLAGS', 'PY_CPPFLAGS', |
367 |
-- 'PY_CORE_CFLAGS') |
368 |
-+_UNIVERSAL_CONFIG_VARS = ('CFLAGS', 'CXXFLAGS', 'LDFLAGS', 'CPPFLAGS', |
369 |
-+ 'BASECFLAGS', 'BLDSHARED', 'LDSHARED', 'LDCXXSHARED', |
370 |
-+ 'CC', 'CXX', 'PY_CFLAGS', 'PY_LDFLAGS', |
371 |
-+ 'PY_CPPFLAGS', 'PY_CORE_CFLAGS') |
372 |
- |
373 |
- # configuration variables that may contain compiler calls |
374 |
--_COMPILER_CONFIG_VARS = ('BLDSHARED', 'LDSHARED', 'CC', 'CXX') |
375 |
-+_COMPILER_CONFIG_VARS = ('BLDSHARED', 'LDSHARED', 'LDCXXSHARED', 'CC', 'CXX') |
376 |
- |
377 |
- # prefix added to original configuration variable names |
378 |
- _INITPRE = '_OSX_SUPPORT_INITIAL_' |
379 |
-diff --git a/distutils/cygwinccompiler.py b/distutils/cygwinccompiler.py |
380 |
-index c879646..a6157fb 100644 |
381 |
---- a/distutils/cygwinccompiler.py |
382 |
-+++ b/distutils/cygwinccompiler.py |
383 |
-@@ -125,8 +125,10 @@ class CygwinCCompiler(UnixCCompiler): |
384 |
- # dllwrap 2.10.90 is buggy |
385 |
- if self.ld_version >= "2.10.90": |
386 |
- self.linker_dll = "gcc" |
387 |
-+ self.linker_dll_cxx = "g++" |
388 |
- else: |
389 |
- self.linker_dll = "dllwrap" |
390 |
-+ self.linker_dll_cxx = "dllwrap" |
391 |
- |
392 |
- # ld_version >= "2.13" support -shared so use it instead of |
393 |
- # -mdll -static |
394 |
-@@ -140,9 +142,13 @@ class CygwinCCompiler(UnixCCompiler): |
395 |
- self.set_executables(compiler='gcc -mcygwin -O -Wall', |
396 |
- compiler_so='gcc -mcygwin -mdll -O -Wall', |
397 |
- compiler_cxx='g++ -mcygwin -O -Wall', |
398 |
-+ compiler_so_cxx='g++ -mcygwin -mdll -O -Wall', |
399 |
- linker_exe='gcc -mcygwin', |
400 |
- linker_so=('%s -mcygwin %s' % |
401 |
-- (self.linker_dll, shared_option))) |
402 |
-+ (self.linker_dll, shared_option)), |
403 |
-+ linker_exe_cxx='g++ -mcygwin', |
404 |
-+ linker_so_cxx=('%s -mcygwin %s' % |
405 |
-+ (self.linker_dll_cxx, shared_option))) |
406 |
- |
407 |
- # cygwin and mingw32 need different sets of libraries |
408 |
- if self.gcc_version == "2.91.57": |
409 |
-@@ -166,8 +172,12 @@ class CygwinCCompiler(UnixCCompiler): |
410 |
- raise CompileError(msg) |
411 |
- else: # for other files use the C-compiler |
412 |
- try: |
413 |
-- self.spawn(self.compiler_so + cc_args + [src, '-o', obj] + |
414 |
-- extra_postargs) |
415 |
-+ if self.detect_language(src) == 'c++': |
416 |
-+ self.spawn(self.compiler_so_cxx + cc_args + [src, '-o', obj] + |
417 |
-+ extra_postargs) |
418 |
-+ else: |
419 |
-+ self.spawn(self.compiler_so + cc_args + [src, '-o', obj] + |
420 |
-+ extra_postargs) |
421 |
- except DistutilsExecError as msg: |
422 |
- raise CompileError(msg) |
423 |
- |
424 |
-@@ -302,9 +312,14 @@ class Mingw32CCompiler(CygwinCCompiler): |
425 |
- self.set_executables(compiler='gcc -O -Wall', |
426 |
- compiler_so='gcc -mdll -O -Wall', |
427 |
- compiler_cxx='g++ -O -Wall', |
428 |
-+ compiler_so_cxx='g++ -mdll -O -Wall', |
429 |
- linker_exe='gcc', |
430 |
- linker_so='%s %s %s' |
431 |
- % (self.linker_dll, shared_option, |
432 |
-+ entry_point), |
433 |
-+ linker_exe_cxx='g++', |
434 |
-+ linker_so_cxx='%s %s %s' |
435 |
-+ % (self.linker_dll_cxx, shared_option, |
436 |
- entry_point)) |
437 |
- # Maybe we should also append -mthreads, but then the finished |
438 |
- # dlls need another dll (mingwm10.dll see Mingw32 docs) |
439 |
-diff --git a/distutils/sysconfig_cpython.py b/distutils/sysconfig_cpython.py |
440 |
-index 573724d..0a04f33 100644 |
441 |
---- a/distutils/sysconfig_cpython.py |
442 |
-+++ b/distutils/sysconfig_cpython.py |
443 |
-@@ -173,9 +173,12 @@ def customize_compiler(compiler): |
444 |
- _osx_support.customize_compiler(_config_vars) |
445 |
- _config_vars['CUSTOMIZED_OSX_COMPILER'] = 'True' |
446 |
- |
447 |
-- (cc, cxx, opt, cflags, ccshared, ldshared, shlib_suffix, ar, ar_flags) = \ |
448 |
-- get_config_vars('CC', 'CXX', 'OPT', 'CFLAGS', |
449 |
-- 'CCSHARED', 'LDSHARED', 'SHLIB_SUFFIX', 'AR', 'ARFLAGS') |
450 |
-+ (cc, cxx, ccshared, ldshared, ldcxxshared, shlib_suffix, ar, ar_flags) = \ |
451 |
-+ get_config_vars('CC', 'CXX', 'CCSHARED', 'LDSHARED', 'LDCXXSHARED', |
452 |
-+ 'SHLIB_SUFFIX', 'AR', 'ARFLAGS') |
453 |
-+ |
454 |
-+ cflags = '' |
455 |
-+ cxxflags = '' |
456 |
- |
457 |
- if 'CC' in os.environ: |
458 |
- newcc = os.environ['CC'] |
459 |
-@@ -190,19 +193,27 @@ def customize_compiler(compiler): |
460 |
- cxx = os.environ['CXX'] |
461 |
- if 'LDSHARED' in os.environ: |
462 |
- ldshared = os.environ['LDSHARED'] |
463 |
-+ if 'LDCXXSHARED' in os.environ: |
464 |
-+ ldcxxshared = os.environ['LDCXXSHARED'] |
465 |
- if 'CPP' in os.environ: |
466 |
- cpp = os.environ['CPP'] |
467 |
- else: |
468 |
- cpp = cc + " -E" # not always |
469 |
- if 'LDFLAGS' in os.environ: |
470 |
- ldshared = ldshared + ' ' + os.environ['LDFLAGS'] |
471 |
-+ ldcxxshared = ldcxxshared + ' ' + os.environ['LDFLAGS'] |
472 |
- if 'CFLAGS' in os.environ: |
473 |
-- cflags = opt + ' ' + os.environ['CFLAGS'] |
474 |
-+ cflags = os.environ['CFLAGS'] |
475 |
- ldshared = ldshared + ' ' + os.environ['CFLAGS'] |
476 |
-+ if 'CXXFLAGS' in os.environ: |
477 |
-+ cxxflags = os.environ['CXXFLAGS'] |
478 |
-+ ldcxxshared = ldcxxshared + ' ' + os.environ['CXXFLAGS'] |
479 |
- if 'CPPFLAGS' in os.environ: |
480 |
- cpp = cpp + ' ' + os.environ['CPPFLAGS'] |
481 |
- cflags = cflags + ' ' + os.environ['CPPFLAGS'] |
482 |
-+ cxxflags = cxxflags + ' ' + os.environ['CPPFLAGS'] |
483 |
- ldshared = ldshared + ' ' + os.environ['CPPFLAGS'] |
484 |
-+ ldcxxshared = ldcxxshared + ' ' + os.environ['CPPFLAGS'] |
485 |
- if 'AR' in os.environ: |
486 |
- ar = os.environ['AR'] |
487 |
- if 'ARFLAGS' in os.environ: |
488 |
-@@ -211,13 +222,17 @@ def customize_compiler(compiler): |
489 |
- archiver = ar + ' ' + ar_flags |
490 |
- |
491 |
- cc_cmd = cc + ' ' + cflags |
492 |
-+ cxx_cmd = cxx + ' ' + cxxflags |
493 |
- compiler.set_executables( |
494 |
- preprocessor=cpp, |
495 |
- compiler=cc_cmd, |
496 |
- compiler_so=cc_cmd + ' ' + ccshared, |
497 |
-- compiler_cxx=cxx, |
498 |
-+ compiler_cxx=cxx_cmd, |
499 |
-+ compiler_so_cxx=cxx_cmd + ' ' + ccshared, |
500 |
- linker_so=ldshared, |
501 |
- linker_exe=cc, |
502 |
-+ linker_so_cxx=ldcxxshared, |
503 |
-+ linker_exe_cxx=cxx, |
504 |
- archiver=archiver) |
505 |
- |
506 |
- compiler.shared_lib_extension = shlib_suffix |
507 |
-diff --git a/distutils/sysconfig_pypy.py b/distutils/sysconfig_pypy.py |
508 |
-index a0a8dec..aa97c4e 100644 |
509 |
---- a/distutils/sysconfig_pypy.py |
510 |
-+++ b/distutils/sysconfig_pypy.py |
511 |
-@@ -72,6 +72,7 @@ def _init_posix(): |
512 |
- g['CFLAGS'] = "-DNDEBUG -O2" |
513 |
- g['CCSHARED'] = "-fPIC" |
514 |
- g['LDSHARED'] = "gcc -pthread -shared" |
515 |
-+ g['LDCXXSHARED'] = "g++ -pthread -shared" |
516 |
- g['EXT_SUFFIX'] = so_ext |
517 |
- g['SHLIB_SUFFIX'] = so_ext |
518 |
- g['SO'] = so_ext # deprecated in Python 3, for backward compatibility |
519 |
-@@ -156,36 +157,52 @@ def customize_compiler(compiler): |
520 |
- _osx_support.customize_compiler(_config_vars) |
521 |
- _config_vars['CUSTOMIZED_OSX_COMPILER'] = 'True' |
522 |
- |
523 |
-- (cc, cxx, opt, cflags, ccshared, ldshared, shlib_suffix, ar, ar_flags) = \ |
524 |
-- get_config_vars('CC', 'CXX', 'OPT', 'CFLAGS', |
525 |
-- 'CCSHARED', 'LDSHARED', 'SHLIB_SUFFIX', 'AR', 'ARFLAGS') |
526 |
-+ (cc, cxx, ccshared, ldshared, ldcxxshared, shlib_suffix, ar, ar_flags) = \ |
527 |
-+ get_config_vars('CC', 'CXX', 'CCSHARED', 'LDSHARED', 'LDCXXSHARED', |
528 |
-+ 'SHLIB_SUFFIX', 'AR', 'ARFLAGS') |
529 |
-+ |
530 |
-+ cflags = '' |
531 |
-+ cxxflags = '' |
532 |
- |
533 |
- if 'CC' in os.environ: |
534 |
- newcc = os.environ['CC'] |
535 |
-- if (sys.platform == 'darwin' |
536 |
-+ if (True |
537 |
- and 'LDSHARED' not in os.environ |
538 |
- and ldshared.startswith(cc)): |
539 |
- # On OS X, if CC is overridden, use that as the default |
540 |
- # command for LDSHARED as well |
541 |
-+ # Gentoo: s/OS X/every system/ |
542 |
- ldshared = newcc + ldshared[len(cc):] |
543 |
- cc = newcc |
544 |
- if 'CXX' in os.environ: |
545 |
-- cxx = os.environ['CXX'] |
546 |
-+ newcxx = os.environ['CXX'] |
547 |
-+ if ('LDCXXSHARED' not in os.environ |
548 |
-+ and ldcxxshared.startswith(cxx)): |
549 |
-+ ldcxxshared = newcxx + ldcxxshared[len(cxx):] |
550 |
-+ cxx = newcxx |
551 |
- if 'LDSHARED' in os.environ: |
552 |
- ldshared = os.environ['LDSHARED'] |
553 |
-+ if 'LDCXXSHARED' in os.environ: |
554 |
-+ ldcxxshared = os.environ['LDCXXSHARED'] |
555 |
- if 'CPP' in os.environ: |
556 |
- cpp = os.environ['CPP'] |
557 |
- else: |
558 |
- cpp = cc + " -E" # not always |
559 |
- if 'LDFLAGS' in os.environ: |
560 |
- ldshared = ldshared + ' ' + os.environ['LDFLAGS'] |
561 |
-+ ldcxxshared = ldcxxshared + ' ' + os.environ['LDFLAGS'] |
562 |
- if 'CFLAGS' in os.environ: |
563 |
-- cflags = opt + ' ' + os.environ['CFLAGS'] |
564 |
-+ cflags = os.environ['CFLAGS'] |
565 |
- ldshared = ldshared + ' ' + os.environ['CFLAGS'] |
566 |
-+ if 'CXXFLAGS' in os.environ: |
567 |
-+ cxxflags = os.environ['CXXFLAGS'] |
568 |
-+ ldcxxshared = ldcxxshared + ' ' + os.environ['CXXFLAGS'] |
569 |
- if 'CPPFLAGS' in os.environ: |
570 |
- cpp = cpp + ' ' + os.environ['CPPFLAGS'] |
571 |
- cflags = cflags + ' ' + os.environ['CPPFLAGS'] |
572 |
-+ cxxflags = cxxflags + ' ' + os.environ['CPPFLAGS'] |
573 |
- ldshared = ldshared + ' ' + os.environ['CPPFLAGS'] |
574 |
-+ ldcxxshared = ldcxxshared + ' ' + os.environ['CPPFLAGS'] |
575 |
- if 'AR' in os.environ: |
576 |
- ar = os.environ['AR'] |
577 |
- if 'ARFLAGS' in os.environ: |
578 |
-@@ -194,13 +211,17 @@ def customize_compiler(compiler): |
579 |
- archiver = ar + ' ' + ar_flags |
580 |
- |
581 |
- cc_cmd = cc + ' ' + cflags |
582 |
-+ cxx_cmd = cxx + ' ' + cxxflags |
583 |
- compiler.set_executables( |
584 |
- preprocessor=cpp, |
585 |
- compiler=cc_cmd, |
586 |
- compiler_so=cc_cmd + ' ' + ccshared, |
587 |
-- compiler_cxx=cxx, |
588 |
-+ compiler_cxx=cxx_cmd, |
589 |
-+ compiler_so_cxx=cxx_cmd + ' ' + ccshared, |
590 |
- linker_so=ldshared, |
591 |
- linker_exe=cc, |
592 |
-+ linker_so_cxx=ldcxxshared, |
593 |
-+ linker_exe_cxx=cxx, |
594 |
- archiver=archiver) |
595 |
- |
596 |
- compiler.shared_lib_extension = shlib_suffix |
597 |
-diff --git a/distutils/unixccompiler.py b/distutils/unixccompiler.py |
598 |
-index 254b22d..c9cacc1 100644 |
599 |
---- a/distutils/unixccompiler.py |
600 |
-+++ b/distutils/unixccompiler.py |
601 |
-@@ -52,14 +52,17 @@ class UnixCCompiler(CCompiler): |
602 |
- # are pretty generic; they will probably have to be set by an outsider |
603 |
- # (eg. using information discovered by the sysconfig about building |
604 |
- # Python extensions). |
605 |
-- executables = {'preprocessor' : None, |
606 |
-- 'compiler' : ["cc"], |
607 |
-- 'compiler_so' : ["cc"], |
608 |
-- 'compiler_cxx' : ["c++"], # pypy: changed, 'cc' is bogus |
609 |
-- 'linker_so' : ["cc", "-shared"], |
610 |
-- 'linker_exe' : ["cc"], |
611 |
-- 'archiver' : ["ar", "-cr"], |
612 |
-- 'ranlib' : None, |
613 |
-+ executables = {'preprocessor' : None, |
614 |
-+ 'compiler' : ["cc"], |
615 |
-+ 'compiler_so' : ["cc"], |
616 |
-+ 'compiler_cxx' : ["c++"], |
617 |
-+ 'compiler_so_cxx' : ["c++"], |
618 |
-+ 'linker_so' : ["cc", "-shared"], |
619 |
-+ 'linker_exe' : ["cc"], |
620 |
-+ 'linker_so_cxx' : ["c++", "-shared"], |
621 |
-+ 'linker_exe_cxx' : ["c++"], |
622 |
-+ 'archiver' : ["ar", "-cr"], |
623 |
-+ 'ranlib' : None, |
624 |
- } |
625 |
- |
626 |
- if sys.platform[:6] == "darwin": |
627 |
-@@ -125,12 +128,19 @@ class UnixCCompiler(CCompiler): |
628 |
- |
629 |
- def _compile(self, obj, src, ext, cc_args, extra_postargs, pp_opts): |
630 |
- compiler_so = self.compiler_so |
631 |
-+ compiler_so_cxx = self.compiler_so_cxx |
632 |
- if sys.platform == 'darwin': |
633 |
- compiler_so = _osx_support.compiler_fixup(compiler_so, |
634 |
- cc_args + extra_postargs) |
635 |
-+ compiler_so_cxx = _osx_support.compiler_fixup(compiler_so_cxx, |
636 |
-+ cc_args + extra_postargs) |
637 |
- try: |
638 |
-- self.spawn(compiler_so + cc_args + [src, '-o', obj] + |
639 |
-- extra_postargs) |
640 |
-+ if self.detect_language(src) == 'c++': |
641 |
-+ self.spawn(compiler_so_cxx + cc_args + [src, '-o', obj] + |
642 |
-+ extra_postargs) |
643 |
-+ else: |
644 |
-+ self.spawn(compiler_so + cc_args + [src, '-o', obj] + |
645 |
-+ extra_postargs) |
646 |
- except DistutilsExecError as msg: |
647 |
- raise CompileError(msg) |
648 |
- |
649 |
-@@ -188,22 +198,16 @@ class UnixCCompiler(CCompiler): |
650 |
- ld_args.extend(extra_postargs) |
651 |
- self.mkpath(os.path.dirname(output_filename)) |
652 |
- try: |
653 |
-- if target_desc == CCompiler.EXECUTABLE: |
654 |
-- linker = self.linker_exe[:] |
655 |
-+ if target_lang == "c++": |
656 |
-+ if target_desc == CCompiler.EXECUTABLE: |
657 |
-+ linker = self.linker_exe_cxx[:] |
658 |
-+ else: |
659 |
-+ linker = self.linker_so_cxx[:] |
660 |
- else: |
661 |
-- linker = self.linker_so[:] |
662 |
-- if target_lang == "c++" and self.compiler_cxx: |
663 |
-- # skip over environment variable settings if /usr/bin/env |
664 |
-- # is used to set up the linker's environment. |
665 |
-- # This is needed on OSX. Note: this assumes that the |
666 |
-- # normal and C++ compiler have the same environment |
667 |
-- # settings. |
668 |
-- i = 0 |
669 |
-- if os.path.basename(linker[0]) == "env": |
670 |
-- i = 1 |
671 |
-- while '=' in linker[i]: |
672 |
-- i += 1 |
673 |
-- linker[i] = self.compiler_cxx[i] |
674 |
-+ if target_desc == CCompiler.EXECUTABLE: |
675 |
-+ linker = self.linker_exe[:] |
676 |
-+ else: |
677 |
-+ linker = self.linker_so[:] |
678 |
- |
679 |
- if sys.platform == 'darwin': |
680 |
- linker = _osx_support.compiler_fixup(linker, ld_args) |
681 |
--- |
682 |
-2.12.2 |
683 |
- |
684 |
|
685 |
diff --git a/dev-python/pypy3-bin/metadata.xml b/dev-python/pypy3-bin/metadata.xml |
686 |
index fd25587b849..ff5bc95069a 100644 |
687 |
--- a/dev-python/pypy3-bin/metadata.xml |
688 |
+++ b/dev-python/pypy3-bin/metadata.xml |
689 |
@@ -5,9 +5,6 @@ |
690 |
<email>python@g.o</email> |
691 |
<name>Python</name> |
692 |
</maintainer> |
693 |
- <use> |
694 |
- <flag name="shadowstack">Use a shadow stack for finding GC roots</flag> |
695 |
- </use> |
696 |
<upstream> |
697 |
<remote-id type="bitbucket">pypy/pypy</remote-id> |
698 |
</upstream> |
699 |
|
700 |
diff --git a/dev-python/pypy3-bin/pypy3-bin-5.5.0_alpha.ebuild b/dev-python/pypy3-bin/pypy3-bin-5.5.0_alpha.ebuild |
701 |
deleted file mode 100644 |
702 |
index 98c88850baf..00000000000 |
703 |
--- a/dev-python/pypy3-bin/pypy3-bin-5.5.0_alpha.ebuild |
704 |
+++ /dev/null |
705 |
@@ -1,200 +0,0 @@ |
706 |
-# Copyright 1999-2016 Gentoo Foundation |
707 |
-# Distributed under the terms of the GNU General Public License v2 |
708 |
- |
709 |
-EAPI=5 |
710 |
- |
711 |
-# some random parts need python 2... |
712 |
-PYTHON_COMPAT=( python2_7 pypy ) |
713 |
-inherit eutils multilib pax-utils python-any-r1 unpacker versionator |
714 |
- |
715 |
-CPY_PATCHSET_VERSION="3.3.5-0" |
716 |
-BINHOST="https://dev.gentoo.org/~mgorny/dist/pypy3-bin/${PV}" |
717 |
- |
718 |
-DESCRIPTION="A fast, compliant alternative implementation of Python 3.3 (binary package)" |
719 |
-HOMEPAGE="http://pypy.org/" |
720 |
-SRC_URI="https://bitbucket.org/pypy/pypy/downloads/pypy3.3-v${PV/_/-}-src.tar.bz2 |
721 |
- https://dev.gentoo.org/~floppym/python-gentoo-patches-${CPY_PATCHSET_VERSION}.tar.xz |
722 |
- amd64? ( |
723 |
- jit? ( shadowstack? ( |
724 |
- ${BINHOST}/${P}-amd64+bzip2+jit+ncurses+shadowstack.tar.lz |
725 |
- ) ) |
726 |
- jit? ( !shadowstack? ( |
727 |
- ${BINHOST}/${P}-amd64+bzip2+jit+ncurses.tar.lz |
728 |
- ) ) |
729 |
- !jit? ( !shadowstack? ( |
730 |
- ${BINHOST}/${P}-amd64+bzip2+ncurses.tar.lz |
731 |
- ) ) |
732 |
- ) |
733 |
- x86? ( |
734 |
- cpu_flags_x86_sse2? ( |
735 |
- jit? ( shadowstack? ( |
736 |
- ${BINHOST}/${P}-x86+bzip2+jit+ncurses+shadowstack+sse2.tar.lz |
737 |
- ) ) |
738 |
- jit? ( !shadowstack? ( |
739 |
- ${BINHOST}/${P}-x86+bzip2+jit+ncurses+sse2.tar.lz |
740 |
- ) ) |
741 |
- !jit? ( !shadowstack? ( |
742 |
- ${BINHOST}/${P}-x86+bzip2+ncurses+sse2.tar.lz |
743 |
- ) ) |
744 |
- ) |
745 |
- !cpu_flags_x86_sse2? ( |
746 |
- !jit? ( !shadowstack? ( |
747 |
- ${BINHOST}/${P}-x86+bzip2+ncurses.tar.lz |
748 |
- ) ) |
749 |
- ) |
750 |
- )" |
751 |
- |
752 |
-# Supported variants |
753 |
-REQUIRED_USE="!jit? ( !shadowstack ) |
754 |
- x86? ( !cpu_flags_x86_sse2? ( !jit !shadowstack ) )" |
755 |
- |
756 |
-LICENSE="MIT" |
757 |
-# XX from pypy3-XX.so module suffix |
758 |
-SLOT="0/55" |
759 |
-KEYWORDS="~amd64 ~x86" |
760 |
-IUSE="gdbm +jit +shadowstack sqlite cpu_flags_x86_sse2 test tk" |
761 |
- |
762 |
-# yep, world would be easier if people started filling subslots... |
763 |
-RDEPEND=" |
764 |
- app-arch/bzip2:0= |
765 |
- dev-libs/expat:0= |
766 |
- dev-libs/libffi:0= |
767 |
- dev-libs/openssl:0= |
768 |
- sys-libs/glibc:2.2= |
769 |
- sys-libs/ncurses:0/6 |
770 |
- sys-libs/zlib:0= |
771 |
- gdbm? ( sys-libs/gdbm:0= ) |
772 |
- sqlite? ( dev-db/sqlite:3= ) |
773 |
- tk? ( |
774 |
- dev-lang/tk:0= |
775 |
- dev-tcltk/tix:0= |
776 |
- ) |
777 |
- !dev-python/pypy3:0" |
778 |
-DEPEND="${RDEPEND} |
779 |
- app-arch/lzip |
780 |
- test? ( ${PYTHON_DEPS} )" |
781 |
-# doc? ( ${PYTHON_DEPS} |
782 |
-# dev-python/sphinx ) |
783 |
- |
784 |
-# Who would care about predictable directory names? |
785 |
-S="${WORKDIR}/pypy3-v${PV%_*}-src" |
786 |
- |
787 |
-QA_PREBUILT=" |
788 |
- usr/lib*/pypy3/pypy-c |
789 |
- usr/lib*/pypy3/libpypy-c.so" |
790 |
- |
791 |
-src_prepare() { |
792 |
- epatch "${FILESDIR}/4.0.0-gentoo-path.patch" \ |
793 |
- "${FILESDIR}/1.9-distutils.unixccompiler.UnixCCompiler.runtime_library_dir_option.patch" |
794 |
- |
795 |
- sed -e "s^@EPREFIX@^${EPREFIX}^" \ |
796 |
- -e "s^@libdir@^$(get_libdir)^" \ |
797 |
- -i lib-python/3/distutils/command/install.py || die |
798 |
- |
799 |
- # apply CPython stdlib patches |
800 |
- pushd lib-python/3 > /dev/null || die |
801 |
- epatch "${FILESDIR}"/5.2.0-distutils-c++.patch \ |
802 |
- "${WORKDIR}"/patches/24_all_sqlite-3.8.4.patch |
803 |
- popd > /dev/null || die |
804 |
- |
805 |
- epatch_user |
806 |
-} |
807 |
- |
808 |
-src_compile() { |
809 |
- # Tadaam! PyPy compiled! |
810 |
- mv "${WORKDIR}"/${P}*/{libpypy-c.so,pypy-c} . || die |
811 |
- mv "${WORKDIR}"/${P}*/include/*.h include/ || die |
812 |
- mv pypy/module/cpyext/include/*.h include/ || die |
813 |
- |
814 |
- #use doc && emake -C pypy/doc/ html |
815 |
- #needed even without jit :( also needed in both compile and install phases |
816 |
- pax-mark m pypy-c libpypy-c.so |
817 |
-} |
818 |
- |
819 |
-src_test() { |
820 |
- # (unset) |
821 |
- local -x PYTHONDONTWRITEBYTECODE |
822 |
- |
823 |
- # Test runner requires Python 2 too. However, it spawns PyPy3 |
824 |
- # internally so that we end up testing the correct interpreter. |
825 |
- "${PYTHON}" ./pypy/test_all.py --pypy=./pypy-c lib-python || die |
826 |
-} |
827 |
- |
828 |
-src_install() { |
829 |
- local dest=/usr/$(get_libdir)/pypy3 |
830 |
- einfo "Installing PyPy ..." |
831 |
- insinto "${dest}" |
832 |
- doins -r include lib_pypy lib-python pypy-c libpypy-c.so |
833 |
- fperms a+x ${dest}/pypy-c ${dest}/libpypy-c.so |
834 |
- pax-mark m "${ED%/}${dest}/pypy-c" "${ED%/}${dest}/libpypy-c.so" |
835 |
- dosym ../$(get_libdir)/pypy3/pypy-c /usr/bin/pypy3 |
836 |
- dodoc README.rst |
837 |
- |
838 |
- if ! use gdbm; then |
839 |
- rm -r "${ED%/}${dest}"/lib_pypy/gdbm.py \ |
840 |
- "${ED%/}${dest}"/lib-python/*3/test/test_gdbm.py || die |
841 |
- fi |
842 |
- if ! use sqlite; then |
843 |
- rm -r "${ED%/}${dest}"/lib-python/*3/sqlite3 \ |
844 |
- "${ED%/}${dest}"/lib_pypy/_sqlite3.py \ |
845 |
- "${ED%/}${dest}"/lib-python/*3/test/test_sqlite.py || die |
846 |
- fi |
847 |
- if ! use tk; then |
848 |
- rm -r "${ED%/}${dest}"/lib-python/*3/{idlelib,tkinter} \ |
849 |
- "${ED%/}${dest}"/lib_pypy/_tkinter \ |
850 |
- "${ED%/}${dest}"/lib-python/*3/test/test_{tcl,tk,ttk*}.py || die |
851 |
- fi |
852 |
- |
853 |
- # Install docs |
854 |
- #use doc && dohtml -r pypy/doc/_build/html/ |
855 |
- |
856 |
- einfo "Generating caches and byte-compiling ..." |
857 |
- |
858 |
- local -x PYTHON=${ED%/}${dest}/pypy-c |
859 |
- local -x LD_LIBRARY_PATH="${ED%/}${dest}" |
860 |
- # we can't use eclass function since PyPy is dumb and always gives |
861 |
- # paths relative to the interpreter |
862 |
- local PYTHON_SITEDIR=${EPREFIX}/usr/$(get_libdir)/pypy3/site-packages |
863 |
- python_export pypy3 EPYTHON |
864 |
- |
865 |
- echo "EPYTHON='${EPYTHON}'" > epython.py || die |
866 |
- python_domodule epython.py |
867 |
- |
868 |
- # Generate Grammar and PatternGrammar pickles. |
869 |
- "${PYTHON}" -c "import lib2to3.pygram, lib2to3.patcomp; lib2to3.patcomp.PatternCompiler()" \ |
870 |
- || die "Generation of Grammar and PatternGrammar pickles failed" |
871 |
- |
872 |
- # Generate cffi modules |
873 |
- # Please keep in sync with pypy/tool/build_cffi_imports.py! |
874 |
-#cffi_build_scripts = { |
875 |
-# "sqlite3": "_sqlite3_build.py", |
876 |
-# "audioop": "_audioop_build.py", |
877 |
-# "tk": "_tkinter/tklib_build.py", |
878 |
-# "curses": "_curses_build.py" if sys.platform != "win32" else None, |
879 |
-# "syslog": "_syslog_build.py" if sys.platform != "win32" else None, |
880 |
-# "_gdbm": "_gdbm_build.py" if sys.platform != "win32" else None, |
881 |
-# "pwdgrp": "_pwdgrp_build.py" if sys.platform != "win32" else None, |
882 |
-# "resource": "_resource_build.py" if sys.platform != "win32" else None, |
883 |
-# "lzma": "_lzma_build.py", |
884 |
-# "_decimal": "_decimal_build.py", |
885 |
- cffi_targets=( audioop curses syslog pwdgrp resource lzma decimal ) |
886 |
- use gdbm && cffi_targets+=( gdbm ) |
887 |
- use sqlite && cffi_targets+=( sqlite3 ) |
888 |
- use tk && cffi_targets+=( tkinter/tklib ) |
889 |
- |
890 |
- local t |
891 |
- # all modules except tkinter output to . |
892 |
- # tkinter outputs to the correct dir ... |
893 |
- cd "${ED%/}${dest}"/lib_pypy || die |
894 |
- for t in "${cffi_targets[@]}"; do |
895 |
- # tkinter doesn't work via -m |
896 |
- "${PYTHON}" "_${t}_build.py" || die "Failed to build CFFI bindings for ${t}" |
897 |
- done |
898 |
- |
899 |
- # Cleanup temporary objects |
900 |
- find "${ED%/}${dest}" -name "_cffi_*.[co]" -delete || die |
901 |
- find "${ED%/}${dest}" -type d -empty -delete || die |
902 |
- |
903 |
- # compile the installed modules |
904 |
- python_optimize "${ED%/}${dest}" |
905 |
-} |
906 |
|
907 |
diff --git a/dev-python/pypy3-bin/pypy3-bin-5.7.1-r1.ebuild b/dev-python/pypy3-bin/pypy3-bin-5.7.1-r1.ebuild |
908 |
deleted file mode 100644 |
909 |
index a69f3049b29..00000000000 |
910 |
--- a/dev-python/pypy3-bin/pypy3-bin-5.7.1-r1.ebuild |
911 |
+++ /dev/null |
912 |
@@ -1,171 +0,0 @@ |
913 |
-# Copyright 1999-2017 Gentoo Foundation |
914 |
-# Distributed under the terms of the GNU General Public License v2 |
915 |
- |
916 |
-EAPI=6 |
917 |
- |
918 |
-# some random parts need python 2... |
919 |
-PYTHON_COMPAT=( python2_7 pypy ) |
920 |
-inherit pax-utils python-any-r1 unpacker versionator |
921 |
- |
922 |
-BINHOST="https://dev.gentoo.org/~mgorny/dist/pypy3-bin/${PV}" |
923 |
-MY_P=pypy3-v${PV} |
924 |
- |
925 |
-DESCRIPTION="A fast, compliant alternative implementation of Python 3.3 (binary package)" |
926 |
-HOMEPAGE="http://pypy.org/" |
927 |
-SRC_URI="https://bitbucket.org/pypy/pypy/downloads/${MY_P}-src.tar.bz2 |
928 |
- amd64? ( |
929 |
- jit? ( ${BINHOST}/${P}-amd64+bzip2+jit+ncurses.tar.lz ) |
930 |
- !jit? ( ${BINHOST}/${P}-amd64+bzip2+ncurses.tar.lz ) |
931 |
- )" |
932 |
- |
933 |
-LICENSE="MIT" |
934 |
-# XX from pypy3-XX.so module suffix |
935 |
-SLOT="0/57" |
936 |
-KEYWORDS="~amd64" |
937 |
-IUSE="gdbm +jit sqlite test tk" |
938 |
- |
939 |
-# yep, world would be easier if people started filling subslots... |
940 |
-RDEPEND=" |
941 |
- app-arch/bzip2:0= |
942 |
- dev-libs/expat:0= |
943 |
- dev-libs/libffi:0= |
944 |
- dev-libs/openssl:0=[-bindist] |
945 |
- sys-libs/glibc:2.2= |
946 |
- sys-libs/ncurses:0/6 |
947 |
- sys-libs/zlib:0= |
948 |
- gdbm? ( sys-libs/gdbm:0= ) |
949 |
- sqlite? ( dev-db/sqlite:3= ) |
950 |
- tk? ( |
951 |
- dev-lang/tk:0= |
952 |
- dev-tcltk/tix:0= |
953 |
- ) |
954 |
- !dev-python/pypy3:0" |
955 |
-DEPEND="${RDEPEND} |
956 |
- app-arch/lzip |
957 |
- app-arch/xz-utils |
958 |
- test? ( ${PYTHON_DEPS} )" |
959 |
-# doc? ( ${PYTHON_DEPS} |
960 |
-# dev-python/sphinx ) |
961 |
- |
962 |
-S=${WORKDIR}/${MY_P}-src |
963 |
- |
964 |
-QA_PREBUILT=" |
965 |
- usr/lib*/pypy3/pypy3-c |
966 |
- usr/lib*/pypy3/libpypy3-c.so" |
967 |
- |
968 |
-src_prepare() { |
969 |
- eapply "${FILESDIR}/4.0.0-gentoo-path.patch" |
970 |
- eapply "${FILESDIR}/1.9-distutils.unixccompiler.UnixCCompiler.runtime_library_dir_option.patch" |
971 |
- |
972 |
- sed -e "s^@EPREFIX@^${EPREFIX}^" \ |
973 |
- -e "s^@libdir@^$(get_libdir)^" \ |
974 |
- -i lib-python/3/distutils/command/install.py || die |
975 |
- |
976 |
- # apply CPython stdlib patches |
977 |
- pushd lib-python/3 > /dev/null || die |
978 |
- eapply "${FILESDIR}"/5.7.1_all_distutils_cxx.patch |
979 |
- eapply "${FILESDIR}"/python-3.5-distutils-OO-build.patch |
980 |
- popd > /dev/null || die |
981 |
- |
982 |
- eapply_user |
983 |
-} |
984 |
- |
985 |
-src_compile() { |
986 |
- # Tadaam! PyPy compiled! |
987 |
- mv "${WORKDIR}"/${P}*/{libpypy3-c.so,pypy3-c} . || die |
988 |
- mv "${WORKDIR}"/${P}*/include/*.h include/ || die |
989 |
- mv pypy/module/cpyext/include/*.h include/ || die |
990 |
- mv pypy/module/cpyext/parse/*.h include/ || die |
991 |
- |
992 |
- #use doc && emake -C pypy/doc/ html |
993 |
- #needed even without jit :( also needed in both compile and install phases |
994 |
- pax-mark m pypy3-c libpypy3-c.so |
995 |
-} |
996 |
- |
997 |
-src_test() { |
998 |
- # (unset) |
999 |
- local -x PYTHONDONTWRITEBYTECODE |
1000 |
- |
1001 |
- # Test runner requires Python 2 too. However, it spawns PyPy3 |
1002 |
- # internally so that we end up testing the correct interpreter. |
1003 |
- "${PYTHON}" ./pypy/test_all.py --pypy=./pypy3-c lib-python || die |
1004 |
-} |
1005 |
- |
1006 |
-src_install() { |
1007 |
- local dest=/usr/$(get_libdir)/pypy3 |
1008 |
- einfo "Installing PyPy ..." |
1009 |
- insinto "${dest}" |
1010 |
- doins -r include lib_pypy lib-python pypy3-c libpypy3-c.so |
1011 |
- fperms a+x ${dest}/pypy3-c ${dest}/libpypy3-c.so |
1012 |
- pax-mark m "${ED%/}${dest}/pypy3-c" "${ED%/}${dest}/libpypy3-c.so" |
1013 |
- dosym ../$(get_libdir)/pypy3/pypy3-c /usr/bin/pypy3 |
1014 |
- dodoc README.rst |
1015 |
- |
1016 |
- if ! use gdbm; then |
1017 |
- rm -r "${ED%/}${dest}"/lib_pypy/_gdbm* || die |
1018 |
- fi |
1019 |
- if ! use sqlite; then |
1020 |
- rm -r "${ED%/}${dest}"/lib-python/*3/sqlite3 \ |
1021 |
- "${ED%/}${dest}"/lib_pypy/_sqlite3* \ |
1022 |
- "${ED%/}${dest}"/lib-python/*3/test/test_sqlite.py || die |
1023 |
- fi |
1024 |
- if ! use tk; then |
1025 |
- rm -r "${ED%/}${dest}"/lib-python/*3/{idlelib,tkinter} \ |
1026 |
- "${ED%/}${dest}"/lib_pypy/_tkinter \ |
1027 |
- "${ED%/}${dest}"/lib-python/*3/test/test_{tcl,tk,ttk*}.py || die |
1028 |
- fi |
1029 |
- |
1030 |
- # Install docs |
1031 |
- #use doc && dodoc -r pypy/doc/_build/html |
1032 |
- |
1033 |
- einfo "Generating caches and byte-compiling ..." |
1034 |
- |
1035 |
- local -x PYTHON=${ED%/}${dest}/pypy3-c |
1036 |
- local -x LD_LIBRARY_PATH="${ED%/}${dest}" |
1037 |
- # we can't use eclass function since PyPy is dumb and always gives |
1038 |
- # paths relative to the interpreter |
1039 |
- local PYTHON_SITEDIR=${EPREFIX}/usr/$(get_libdir)/pypy3/site-packages |
1040 |
- python_export pypy3 EPYTHON |
1041 |
- |
1042 |
- echo "EPYTHON='${EPYTHON}'" > epython.py || die |
1043 |
- python_domodule epython.py |
1044 |
- |
1045 |
- # Generate Grammar and PatternGrammar pickles. |
1046 |
- "${PYTHON}" -c "import lib2to3.pygram, lib2to3.patcomp; lib2to3.patcomp.PatternCompiler()" \ |
1047 |
- || die "Generation of Grammar and PatternGrammar pickles failed" |
1048 |
- |
1049 |
- # Generate cffi modules |
1050 |
- # Please keep in sync with pypy/tool/build_cffi_imports.py! |
1051 |
-#cffi_build_scripts = { |
1052 |
-# "sqlite3": "_sqlite3_build.py", |
1053 |
-# "audioop": "_audioop_build.py", |
1054 |
-# "tk": "_tkinter/tklib_build.py", |
1055 |
-# "curses": "_curses_build.py" if sys.platform != "win32" else None, |
1056 |
-# "syslog": "_syslog_build.py" if sys.platform != "win32" else None, |
1057 |
-# "_gdbm": "_gdbm_build.py" if sys.platform != "win32" else None, |
1058 |
-# "pwdgrp": "_pwdgrp_build.py" if sys.platform != "win32" else None, |
1059 |
-# "resource": "_resource_build.py" if sys.platform != "win32" else None, |
1060 |
-# "lzma": "_lzma_build.py", |
1061 |
-# "_decimal": "_decimal_build.py", |
1062 |
-# "ssl": "_ssl_build.py", |
1063 |
- cffi_targets=( audioop curses syslog pwdgrp resource lzma decimal ssl ) |
1064 |
- use gdbm && cffi_targets+=( gdbm ) |
1065 |
- use sqlite && cffi_targets+=( sqlite3 ) |
1066 |
- use tk && cffi_targets+=( tkinter/tklib ) |
1067 |
- |
1068 |
- local t |
1069 |
- # all modules except tkinter output to . |
1070 |
- # tkinter outputs to the correct dir ... |
1071 |
- cd "${ED%/}${dest}"/lib_pypy || die |
1072 |
- for t in "${cffi_targets[@]}"; do |
1073 |
- # tkinter doesn't work via -m |
1074 |
- "${PYTHON}" "_${t}_build.py" || die "Failed to build CFFI bindings for ${t}" |
1075 |
- done |
1076 |
- |
1077 |
- # Cleanup temporary objects |
1078 |
- find "${ED%/}${dest}" -name "_cffi_*.[co]" -delete || die |
1079 |
- find "${ED%/}${dest}" -type d -empty -delete || die |
1080 |
- |
1081 |
- # compile the installed modules |
1082 |
- python_optimize "${ED%/}${dest}" |
1083 |
-} |