| 1 |
commit: f4c4fadca0f269d7e2bc305f37e4d43af016d02b |
| 2 |
Author: Michał Górny <mgorny <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Thu Sep 17 14:07:08 2020 +0000 |
| 4 |
Commit: Michał Górny <mgorny <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Thu Sep 17 16:56:19 2020 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f4c4fadc |
| 7 |
|
| 8 |
dev-python/pypy: Fix PYTHON path for byte-compiling modules |
| 9 |
|
| 10 |
Signed-off-by: Michał Górny <mgorny <AT> gentoo.org> |
| 11 |
|
| 12 |
dev-python/pypy/{pypy-7.3.1-r2.ebuild => pypy-7.3.1-r3.ebuild} | 7 ++++++- |
| 13 |
.../pypy/{pypy-7.3.2_rc2.ebuild => pypy-7.3.2_rc2-r1.ebuild} | 7 ++++++- |
| 14 |
2 files changed, 12 insertions(+), 2 deletions(-) |
| 15 |
|
| 16 |
diff --git a/dev-python/pypy/pypy-7.3.1-r2.ebuild b/dev-python/pypy/pypy-7.3.1-r3.ebuild |
| 17 |
similarity index 96% |
| 18 |
rename from dev-python/pypy/pypy-7.3.1-r2.ebuild |
| 19 |
rename to dev-python/pypy/pypy-7.3.1-r3.ebuild |
| 20 |
index 59902f3b0a5..8508153c294 100644 |
| 21 |
--- a/dev-python/pypy/pypy-7.3.1-r2.ebuild |
| 22 |
+++ b/dev-python/pypy/pypy-7.3.1-r3.ebuild |
| 23 |
@@ -166,7 +166,9 @@ src_install() { |
| 24 |
fi |
| 25 |
|
| 26 |
local -x EPYTHON=pypy |
| 27 |
- local -x PYTHON=${ED}${dest}/pypy-c |
| 28 |
+ local -x PYTHON=${ED}${dest}/pypy-c-${PV} |
| 29 |
+ # temporarily copy to build tree to facilitate module builds |
| 30 |
+ cp -p "${BROOT}${dest}/pypy-c-${PV}" "${PYTHON}" || die |
| 31 |
|
| 32 |
echo "EPYTHON='${EPYTHON}'" > epython.py || die |
| 33 |
python_moduleinto /usr/lib/pypy2.7/site-packages |
| 34 |
@@ -174,4 +176,7 @@ src_install() { |
| 35 |
|
| 36 |
einfo "Byte-compiling Python standard library..." |
| 37 |
python_optimize "${ED}${dest}" |
| 38 |
+ |
| 39 |
+ # remove to avoid collisions |
| 40 |
+ rm "${PYTHON}" || die |
| 41 |
} |
| 42 |
|
| 43 |
diff --git a/dev-python/pypy/pypy-7.3.2_rc2.ebuild b/dev-python/pypy/pypy-7.3.2_rc2-r1.ebuild |
| 44 |
similarity index 96% |
| 45 |
rename from dev-python/pypy/pypy-7.3.2_rc2.ebuild |
| 46 |
rename to dev-python/pypy/pypy-7.3.2_rc2-r1.ebuild |
| 47 |
index d6556f35ca7..a5a678ffa9d 100644 |
| 48 |
--- a/dev-python/pypy/pypy-7.3.2_rc2.ebuild |
| 49 |
+++ b/dev-python/pypy/pypy-7.3.2_rc2-r1.ebuild |
| 50 |
@@ -159,7 +159,9 @@ src_install() { |
| 51 |
fi |
| 52 |
|
| 53 |
local -x EPYTHON=pypy |
| 54 |
- local -x PYTHON=${ED}${dest}/pypy-c |
| 55 |
+ local -x PYTHON=${ED}${dest}/pypy-c-${PV} |
| 56 |
+ # temporarily copy to build tree to facilitate module builds |
| 57 |
+ cp -p "${BROOT}${dest}/pypy-c-${PV}" "${PYTHON}" || die |
| 58 |
|
| 59 |
echo "EPYTHON='${EPYTHON}'" > epython.py || die |
| 60 |
python_moduleinto /usr/lib/pypy2.7/site-packages |
| 61 |
@@ -167,4 +169,7 @@ src_install() { |
| 62 |
|
| 63 |
einfo "Byte-compiling Python standard library..." |
| 64 |
python_optimize "${ED}${dest}" |
| 65 |
+ |
| 66 |
+ # remove to avoid collisions |
| 67 |
+ rm "${PYTHON}" || die |
| 68 |
} |
Archives