diff options
| author |   Michał Górny <mgorny@gentoo.org> | 2020-09-17 16:23:52 +0200 |
|---|---|---|
| committer | Michał Górny <mgorny@gentoo.org> | 2020-09-17 18:56:20 +0200 |
| commit | b0c1e014da4e68423a1bf2751c97d0e17ef50a48 (patch) | |
| tree | 7d17da0bf2cb26173bbdf5333c6dd7cc0a682090 /dev-python/pypy3 | |
| parent | dev-python/pypy: Fix PYTHON path for byte-compiling modules (diff) | |
| download | gentoo-b0c1e014da4e68423a1bf2751c97d0e17ef50a48.tar.gz gentoo-b0c1e014da4e68423a1bf2751c97d0e17ef50a48.tar.bz2 gentoo-b0c1e014da4e68423a1bf2751c97d0e17ef50a48.zip | |
dev-python/pypy3: Fix PYTHON path for byte-compiling modules
Signed-off-by: Michał Górny <mgorny@gentoo.org>
Diffstat (limited to 'dev-python/pypy3')
| -rw-r--r-- | dev-python/pypy3/pypy3-7.3.1-r3.ebuild (renamed from dev-python/pypy3/pypy3-7.3.1-r2.ebuild) | 7 | ||||
| -rw-r--r-- | dev-python/pypy3/pypy3-7.3.2_rc2-r1.ebuild (renamed from dev-python/pypy3/pypy3-7.3.2_rc2.ebuild) | 7 | ||||
| -rw-r--r-- | dev-python/pypy3/pypy3-7.3.2_rc2_p37-r1.ebuild (renamed from dev-python/pypy3/pypy3-7.3.2_rc2_p37.ebuild) | 7 |
3 files changed, 18 insertions, 3 deletions
diff --git a/dev-python/pypy3/pypy3-7.3.1-r2.ebuild b/dev-python/pypy3/pypy3-7.3.1-r3.ebuild index 3388f868455f..4f4f4bded682 100644 --- a/dev-python/pypy3/pypy3-7.3.1-r2.ebuild +++ b/dev-python/pypy3/pypy3-7.3.1-r3.ebuild @@ -204,7 +204,9 @@ src_install() { fi local -x EPYTHON=pypy3 - local -x PYTHON=${ED}${dest}/pypy3-c + local -x PYTHON=${ED}${dest}/pypy3-c-${PV} + # temporarily copy to build tree to facilitate module builds + cp -p "${BROOT}${dest}/pypy3-c-${PV}" "${PYTHON}" || die echo "EPYTHON='${EPYTHON}'" > epython.py || die python_moduleinto /usr/lib/pypy3.6/site-packages @@ -212,4 +214,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/pypy3/pypy3-7.3.2_rc2.ebuild b/dev-python/pypy3/pypy3-7.3.2_rc2-r1.ebuild index 45d2ebfd2176..acb328c4e725 100644 --- a/dev-python/pypy3/pypy3-7.3.2_rc2.ebuild +++ b/dev-python/pypy3/pypy3-7.3.2_rc2-r1.ebuild @@ -191,7 +191,9 @@ src_install() { fi local -x EPYTHON=pypy3 - local -x PYTHON=${ED}${dest}/pypy3-c + local -x PYTHON=${ED}${dest}/pypy3-c-${PV} + # temporarily copy to build tree to facilitate module builds + cp -p "${BROOT}${dest}/pypy3-c-${PV}" "${PYTHON}" || die echo "EPYTHON='${EPYTHON}'" > epython.py || die python_moduleinto /usr/lib/pypy3.6/site-packages @@ -199,4 +201,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/pypy3/pypy3-7.3.2_rc2_p37.ebuild b/dev-python/pypy3/pypy3-7.3.2_rc2_p37-r1.ebuild index 530c3ef5cebc..d750cf9c4b2b 100644 --- a/dev-python/pypy3/pypy3-7.3.2_rc2_p37.ebuild +++ b/dev-python/pypy3/pypy3-7.3.2_rc2_p37-r1.ebuild @@ -162,7 +162,9 @@ src_install() { fi local -x EPYTHON=pypy3 - local -x PYTHON=${ED}${dest}/pypy3-c + local -x PYTHON=${ED}${dest}/pypy3-c-${PYPY_PV} + # temporarily copy to build tree to facilitate module builds + cp -p "${BROOT}${dest}/pypy3-c-${PYPY_PV}" "${PYTHON}" || die echo "EPYTHON='${EPYTHON}'" > epython.py || die python_moduleinto /usr/lib/pypy3.7/site-packages @@ -170,4 +172,7 @@ src_install() { einfo "Byte-compiling Python standard library..." python_optimize "${ED}${dest}" + + # remove to avoid collisions + rm "${PYTHON}" || die } |