diff options
| author |   Michał Górny <mgorny@gentoo.org> | 2020-09-17 16:07:08 +0200 |
|---|---|---|
| committer | Michał Górny <mgorny@gentoo.org> | 2020-09-17 18:56:19 +0200 |
| commit | f4c4fadca0f269d7e2bc305f37e4d43af016d02b (patch) | |
| tree | 73cfed5cfdd5992e1daa53a317252e3b295408f1 | |
| parent | dev-python/pypy3-exe-bin: Remove old (diff) | |
| download | gentoo-f4c4fadc.tar.gz gentoo-f4c4fadc.tar.bz2 gentoo-f4c4fadc.zip | |
dev-python/pypy: Fix PYTHON path for byte-compiling modules
Signed-off-by: Michał Górny <mgorny@gentoo.org>
| -rw-r--r-- | dev-python/pypy/pypy-7.3.1-r3.ebuild (renamed from dev-python/pypy/pypy-7.3.1-r2.ebuild) | 7 | ||||
| -rw-r--r-- | dev-python/pypy/pypy-7.3.2_rc2-r1.ebuild (renamed from dev-python/pypy/pypy-7.3.2_rc2.ebuild) | 7 |
2 files changed, 12 insertions, 2 deletions
diff --git a/dev-python/pypy/pypy-7.3.1-r2.ebuild b/dev-python/pypy/pypy-7.3.1-r3.ebuild index 59902f3b0a51..8508153c294f 100644 --- a/dev-python/pypy/pypy-7.3.1-r2.ebuild +++ b/dev-python/pypy/pypy-7.3.1-r3.ebuild @@ -166,7 +166,9 @@ src_install() { fi local -x EPYTHON=pypy - local -x PYTHON=${ED}${dest}/pypy-c + local -x PYTHON=${ED}${dest}/pypy-c-${PV} + # temporarily copy to build tree to facilitate module builds + cp -p "${BROOT}${dest}/pypy-c-${PV}" "${PYTHON}" || die echo "EPYTHON='${EPYTHON}'" > epython.py || die python_moduleinto /usr/lib/pypy2.7/site-packages @@ -174,4 +176,7 @@ src_install() { einfo "Byte-compiling Python standard library..." python_optimize "${ED}${dest}" + + # remove to avoid collisions + rm "${PYTHON}" || die } diff --git a/dev-python/pypy/pypy-7.3.2_rc2.ebuild b/dev-python/pypy/pypy-7.3.2_rc2-r1.ebuild index d6556f35ca7b..a5a678ffa9d0 100644 --- a/dev-python/pypy/pypy-7.3.2_rc2.ebuild +++ b/dev-python/pypy/pypy-7.3.2_rc2-r1.ebuild @@ -159,7 +159,9 @@ src_install() { fi local -x EPYTHON=pypy - local -x PYTHON=${ED}${dest}/pypy-c + local -x PYTHON=${ED}${dest}/pypy-c-${PV} + # temporarily copy to build tree to facilitate module builds + cp -p "${BROOT}${dest}/pypy-c-${PV}" "${PYTHON}" || die echo "EPYTHON='${EPYTHON}'" > epython.py || die python_moduleinto /usr/lib/pypy2.7/site-packages @@ -167,4 +169,7 @@ src_install() { einfo "Byte-compiling Python standard library..." python_optimize "${ED}${dest}" + + # remove to avoid collisions + rm "${PYTHON}" || die } |