dev-python/pypy3_10: hashlib fixes, sec backports as 7.3.12_rc2_p1

Signed-off-by: Michał Górny <mgorny@gentoo.org>
This commit is contained in:
Michał Górny
2023-06-08 10:50:16 +02:00
parent 1f2f7d118f
commit e72f99656a
2 changed files with 209 additions and 0 deletions

View File

@@ -1,2 +1,3 @@
DIST pypy3.10-gentoo-patches-7.3.12rc2.tar.xz 3416 BLAKE2B 5aac048a8758aff3ea43de12da8b5bcffb5ca1a97d58b307d9badb9583376f0c2513d034ec394216b5d20ab5985a7f1142bd20f9affd5c48b8b86a5286194bad SHA512 3980fef808ac4d9530f9cc4f17ff70eff2612c31f7470c62a4ad83d727216c19cac62d6874d7187004ba83e1fbd349efebc303e0f74c3491baebaf8a630f6a89
DIST pypy3.10-gentoo-patches-7.3.12rc2_p1.tar.xz 7952 BLAKE2B 651a1f036df60b919e486a18082781be1244a88168579fbdb110eaeee73610eed7ddd77c68bdbca717a79d86ac91fe5342d8eb685b1c023a39ef5896c59e0932 SHA512 e361e781ecea0db4b5bb359a1b81e987ac5687a45d6cb6b20e41aa90a6bfee1ea5dd68823a99a3671d35759c5522571afa8c9410caa676cfaf5c27cb88ee4644
DIST pypy3.10-v7.3.12rc2-src.tar.bz2 23030434 BLAKE2B a94e427450350c239bd514a9747813337b1208edafeb6a05c18c0b7cd2075edd480d2081d605e62ec9b1ed227154396ed30bba05294db722a43de33c46e34893 SHA512 9e850d3ba16db7dc36069e50c3026d812f08763c5a92fc5e43fff0fcf54fad202c2a13b7101c49d52ee2fb89062fab335473334ccdd067d69ace6d9ecf7f92d2

View File

@@ -0,0 +1,208 @@
# Copyright 1999-2023 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=8
inherit pax-utils python-utils-r1 toolchain-funcs
PYPY_PV=${PV%_p*}
PYVER=3.10
MY_P="pypy${PYVER}-v${PYPY_PV/_}"
PATCHSET="pypy${PYVER}-gentoo-patches-${PV/_rc/rc}"
DESCRIPTION="A fast, compliant alternative implementation of the Python (${PYVER}) language"
HOMEPAGE="
https://www.pypy.org/
https://foss.heptapod.net/pypy/pypy/
"
SRC_URI="
https://buildbot.pypy.org/pypy/${MY_P}-src.tar.bz2
https://dev.gentoo.org/~mgorny/dist/python/${PATCHSET}.tar.xz
"
S="${WORKDIR}/${MY_P}-src"
LICENSE="MIT"
# pypy3 -c 'import sysconfig; print(sysconfig.get_config_var("SOABI"))'
# also check pypy/interpreter/pycode.py -> pypy_incremental_magic
SLOT="0/pypy310-pp73-384"
KEYWORDS=""
IUSE="+ensurepip gdbm +jit ncurses sqlite tk"
# many tests are failing upstream
# see https://buildbot.pypy.org/summary?branch=py${PYVER}
RESTRICT="test"
RDEPEND="
|| (
>=dev-python/${PN}-exe-${PYPY_PV}:${PYPY_PV}[bzip2(+),ncurses?]
>=dev-python/${PN}-exe-bin-${PYPY_PV}:${PYPY_PV}
)
dev-lang/python-exec[python_targets_pypy3(-)]
dev-libs/openssl:0=
dev-python/gentoo-common
ensurepip? ( dev-python/ensurepip-wheels )
gdbm? ( sys-libs/gdbm:0= )
sqlite? ( dev-db/sqlite:3= )
tk? (
dev-lang/tk:0=
dev-tcltk/tix:0=
)
!~dev-python/pypy3-7.3.12_rc1
"
DEPEND="
${RDEPEND}
"
src_prepare() {
local PATCHES=(
"${WORKDIR}/${PATCHSET}"
)
default
eapply_user
}
src_configure() {
tc-export CC
}
src_compile() {
mkdir bin || die
# switch to the layout expected for cffi module builds
mkdir include/pypy${PYVER} || die
# copy over to make sys.prefix happy
cp -p "${BROOT}"/usr/bin/pypy${PYVER}-c-${PYPY_PV} pypy${PYVER}-c || die
cp -p "${BROOT}"/usr/include/pypy${PYVER}/${PYPY_PV}/* include/pypy${PYVER}/ || die
# (not installed by pypy-exe)
rm pypy/module/cpyext/include/_numpypy/numpy/README || die
mv pypy/module/cpyext/include/* include/pypy${PYVER}/ || die
mv pypy/module/cpyext/parse/*.h include/pypy${PYVER}/ || die
pax-mark m pypy${PYVER}-c
# verify the subslot
local soabi=$(
./pypy${PYVER}-c - <<-EOF
import importlib.util
import sysconfig
soabi = sysconfig.get_config_var("SOABI")
magic = importlib.util._RAW_MAGIC_NUMBER & 0xffff
print(f"{soabi}-{magic}")
EOF
)
[[ ${soabi} == ${SLOT#*/} ]] || die "update subslot to ${soabi}"
# Add epython.py to the distribution
echo 'EPYTHON="pypy3"' > lib-python/3/epython.py || die
einfo "Generating caches and CFFI modules ..."
# Generate sysconfig data
local host_gnu_type=$(sh pypy/tool/release/config.guess)
local overrides=(
HOST_GNU_TYPE "${host_gnu_type:-unknown}"
INCLUDEPY "${EPREFIX}/usr/include/pypy${PYVER}"
LIBDIR "${EPREFIX}/usr/$(get_libdir)"
TZPATH "${EPREFIX}/usr/share/zoneinfo"
WHEEL_PKG_DIR "${EPREFIX}/usr/lib/python/ensurepip"
)
./pypy${PYVER}-c -m sysconfig --generate-posix-vars "${overrides[@]}" || die
local outdir
outdir=$(<pybuilddir.txt) || die
cp "${outdir}"/_sysconfigdata__*.py lib-python/3/ || die
# Generate Grammar and PatternGrammar pickles.
./pypy${PYVER}-c - <<-EOF || die "Generation of Grammar and PatternGrammar pickles failed"
import lib2to3.pygram
import lib2to3.patcomp
lib2to3.patcomp.PatternCompiler()
EOF
# Generate cffi modules
# Please keep in sync with lib_pypy/pypy_tools/build_cffi_imports.py!
# (NB: we build CFFI modules first to avoid error log when importing
# build_cffi_imports).
cffi_targets=(
pypy_util blake2/_blake2 sha3/_sha3 ssl
audioop syslog pwdgrp resource lzma posixshmem
)
use gdbm && cffi_targets+=( gdbm )
use ncurses && cffi_targets+=( curses )
use sqlite && cffi_targets+=( sqlite3 )
use tk && cffi_targets+=( tkinter/tklib )
local t
# all modules except tkinter output to .
# tkinter outputs to the correct dir ...
cd lib_pypy || die
for t in "${cffi_targets[@]}"; do
# tkinter doesn't work via -m
../pypy${PYVER}-c "_${t}_build.py" || die "Failed to build CFFI bindings for ${t}"
done
# Verify that CFFI module list is up-to-date
local expected_cksum=63d4659f
local local_cksum=$(
../pypy${PYVER}-c - <<-EOF
import binascii
import json
from pypy_tools.build_cffi_imports import cffi_build_scripts as x
print("%08x" % (binascii.crc32(json.dumps(x).encode()),))
EOF
)
if [[ ${local_cksum} != ${expected_cksum} ]]; then
die "Please verify cffi_targets and update checksum to ${local_cksum}"
fi
# Cleanup temporary objects
find -name "*_cffi.[co]" -delete || die
find -type d -empty -delete || die
}
src_install() {
einfo "Installing PyPy ..."
dodir /usr/bin
dosym pypy${PYVER}-c-${PYPY_PV} /usr/bin/pypy${PYVER}
insinto /usr/lib/pypy${PYVER}
# preserve mtimes to avoid obsoleting caches
insopts -p
doins -r lib-python/3/. lib_pypy/.
insinto /usr/include
doins -r include/pypy${PYVER}
# replace copied headers with symlinks
for x in "${BROOT}"/usr/include/pypy${PYVER}/${PYPY_PV}/*; do
dosym "${PYPY_PV}/${x##*/}" "/usr/include/pypy${PYVER}/${x##*/}"
done
dodoc README.rst
local dest=/usr/lib/pypy${PYVER}
rm -r "${ED}${dest}"/ensurepip/_bundled || die
if ! use ensurepip; then
rm -r "${ED}${dest}"/ensurepip || die
fi
if ! use gdbm; then
rm -r "${ED}${dest}"/_gdbm* || die
fi
if ! use sqlite; then
rm -r "${ED}${dest}"/sqlite3 \
"${ED}${dest}"/_sqlite3* \
"${ED}${dest}"/test/test_sqlite.py || die
fi
if ! use tk; then
rm -r "${ED}${dest}"/{idlelib,tkinter} \
"${ED}${dest}"/_tkinter \
"${ED}${dest}"/test/test_{tcl,tk,ttk*}.py || die
fi
dosym ../python/EXTERNALLY-MANAGED "${dest}/EXTERNALLY-MANAGED"
local -x EPYTHON=pypy3
local -x PYTHON=${ED}/usr/bin/pypy${PYVER}-c-${PYPY_PV}
# temporarily copy to build tree to facilitate module builds
cp -p "${BROOT}/usr/bin/pypy${PYVER}-c-${PYPY_PV}" "${PYTHON}" || die
einfo "Byte-compiling Python standard library..."
python_optimize "${ED}${dest}"
# remove to avoid collisions
rm "${PYTHON}" || die
}