public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed
From: "Michał Górny" <mgorny@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Subject: [gentoo-commits] repo/gentoo:master commit in: dev-python/pypy3/
Date: Tue, 17 May 2022 07:49:21 +0000 (UTC)	[thread overview]
Message-ID: <1652773757.972df7506fdf616e2b923ad4ce44f86a607efb5c.mgorny@gentoo> (raw)

commit:     972df7506fdf616e2b923ad4ce44f86a607efb5c
Author:     Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Tue May 17 07:47:53 2022 +0000
Commit:     Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Tue May 17 07:49:17 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=972df750

dev-python/pypy3: Backport OpenSSL 3 fixes as 7.3.9_p1

Closes: https://bugs.gentoo.org/844148
Signed-off-by: Michał Górny <mgorny <AT> gentoo.org>

 dev-python/pypy3/Manifest              |   1 +
 dev-python/pypy3/pypy3-7.3.9_p1.ebuild | 200 +++++++++++++++++++++++++++++++++
 2 files changed, 201 insertions(+)

diff --git a/dev-python/pypy3/Manifest b/dev-python/pypy3/Manifest
index c5caa42dac85..7a8135fddca1 100644
--- a/dev-python/pypy3/Manifest
+++ b/dev-python/pypy3/Manifest
@@ -1,2 +1,3 @@
 DIST pypy3.9-gentoo-patches-7.3.9.tar.xz 1564 BLAKE2B fe0875ef002842a78fb31589f6d0b255c3dea10f2bd014231ae9b17641f65f810ac84fe7961de1a4614249b0166f2127c3aa37947f7d1d4c85860a31b89110f1 SHA512 a1dc3ee36e908e29b2bbbb100a97b7910bd4325c5dc55c0455cdca450d6b272d1463708b383e0607e9499b1932da4442f97d2da57e47ed3a4ff8fd3c78a54732
+DIST pypy3.9-gentoo-patches-7.3.9_p1.tar.xz 3952 BLAKE2B 20ff145749d24f15214c0c78f3fdc5e1cdbfc307972ad9dbc03f1b9704b25ea962434aee0d58a882912374b45f726eb449f0abafd663bddf14867807951b0a7f SHA512 3ce7a126fb7c52754d3b65e3df0786c80a98522ce78ab44fd5f81cd84a41e8b5929df2d8e4f644ed6c2265ca5da397cd7f37d44944cd08f7c8ae1cc8a2fd7e0d
 DIST pypy3.9-v7.3.9-src.tar.bz2 26976726 BLAKE2B bf1ed21c575901abac020120aaff07ab57f1404713211b19cbd1eb4d6ffc675b7933be8c6fffc2b69ab467963d6598534cd5aa90c02feddad596611d2a6b6581 SHA512 83f8a6a2da351c190d2d224242cbc35e35529c7a8e8d842eaf5c945cbce2e172b02a340f32af3d49df8d5288370d794d5bc95fc12dd4a13d817c925abf06198a

diff --git a/dev-python/pypy3/pypy3-7.3.9_p1.ebuild b/dev-python/pypy3/pypy3-7.3.9_p1.ebuild
new file mode 100644
index 000000000000..536c3974f232
--- /dev/null
+++ b/dev-python/pypy3/pypy3-7.3.9_p1.ebuild
@@ -0,0 +1,200 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python2_7 )
+inherit pax-utils python-any-r1 toolchain-funcs
+
+PYPY_PV=${PV%_p*}
+MY_P=pypy3.9-v${PYPY_PV/_rc/rc}
+PATCHSET="pypy3.9-gentoo-patches-${PV/_rc/rc}"
+
+DESCRIPTION="A fast, compliant alternative implementation of the Python (3.9) language"
+HOMEPAGE="https://www.pypy.org/"
+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/pypy39-pp73"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="bzip2 gdbm +jit ncurses sqlite test tk"
+# many tests are failing upstream
+# see https://buildbot.pypy.org/summary?branch=py3.9
+RESTRICT="test"
+
+RDEPEND="
+	|| (
+		>=dev-python/pypy3-exe-${PYPY_PV}:3.9-${PYPY_PV}[bzip2?,ncurses?]
+		>=dev-python/pypy3-exe-bin-${PYPY_PV}:3.9-${PYPY_PV}
+	)
+	dev-lang/python-exec[python_targets_pypy3(-)]
+	dev-libs/openssl:0=
+	gdbm? ( sys-libs/gdbm:0= )
+	sqlite? ( dev-db/sqlite:3= )
+	tk? (
+		dev-lang/tk:0=
+		dev-tcltk/tix:0=
+	)
+	!<dev-python/pypy3-bin-7.3.0:0
+"
+DEPEND="
+	${RDEPEND}
+	test? (
+		${PYTHON_DEPS}
+		!!dev-python/pytest-forked
+	)
+"
+
+pkg_setup() {
+	use test && python-any-r1_pkg_setup
+}
+
+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/pypy3.9 || die
+	# copy over to make sys.prefix happy
+	cp -p "${BROOT}"/usr/bin/pypy3.9-c-${PYPY_PV} pypy3.9-c || die
+	cp -p "${BROOT}"/usr/include/pypy3.9/${PYPY_PV}/* include/pypy3.9/ || die
+	# (not installed by pypy-exe)
+	rm pypy/module/cpyext/include/_numpypy/numpy/README || die
+	mv pypy/module/cpyext/include/* include/pypy3.9/ || die
+	mv pypy/module/cpyext/parse/*.h include/pypy3.9/ || die
+	pax-mark m pypy3.9-c
+
+	# verify the subslot
+	local soabi=$(
+		./pypy3.9-c - <<-EOF
+			import sysconfig
+			print(sysconfig.get_config_var("SOABI"))
+		EOF
+	)
+	[[ ${soabi} == ${SLOT#*/} ]] || die "update subslot to ${soabi}"
+
+	einfo "Generating caches and CFFI modules ..."
+
+	# Generate Grammar and PatternGrammar pickles.
+	./pypy3.9-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 pypy/tool/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
+		../pypy3.9-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=$(
+		../pypy3.9-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_test() {
+	# (unset)
+	local -x PYTHONDONTWRITEBYTECODE=
+	local -x COLUMNS=80
+
+	# Test runner requires Python 2 too. However, it spawns PyPy3
+	# internally so that we end up testing the correct interpreter.
+	# (--deselect for failing doctests)
+	"${EPYTHON}" ./pypy/test_all.py --pypy=./pypy3.9-c -vv lib-python || die
+}
+
+src_install() {
+	einfo "Installing PyPy ..."
+	dodir /usr/bin
+	dosym pypy3.9-c-${PYPY_PV} /usr/bin/pypy3.9
+	dosym pypy3.9 /usr/bin/pypy3
+	insinto /usr/lib/pypy3.9
+	# preserve mtimes to avoid obsoleting caches
+	insopts -p
+	doins -r lib-python/3/. lib_pypy/.
+	insinto /usr/include
+	doins -r include/pypy3.9
+
+	# replace copied headers with symlinks
+	for x in "${BROOT}"/usr/include/pypy3.9/${PYPY_PV}/*; do
+		dosym "${PYPY_PV}/${x##*/}" "/usr/include/pypy3.9/${x##*/}"
+	done
+
+	dodoc README.rst
+
+	local dest=/usr/lib/pypy3.9
+	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
+
+	local -x EPYTHON=pypy3
+	local -x PYTHON=${ED}/usr/bin/pypy3.9-c-${PYPY_PV}
+	# temporarily copy to build tree to facilitate module builds
+	cp -p "${BROOT}/usr/bin/pypy3.9-c-${PYPY_PV}" "${PYTHON}" || die
+
+	echo "EPYTHON='${EPYTHON}'" > epython.py || die
+	python_moduleinto "${dest}"/site-packages
+	python_domodule epython.py
+
+	einfo "Byte-compiling Python standard library..."
+	python_optimize "${ED}${dest}"
+
+	# remove to avoid collisions
+	rm "${PYTHON}" || die
+}


             reply	other threads:[~2022-05-17  7:49 UTC|newest]

Thread overview: 195+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2022-05-17  7:49 Michał Górny [this message]
  -- strict thread matches above, loose matches on Subject: below --
2024-09-27  9:42 [gentoo-commits] repo/gentoo:master commit in: dev-python/pypy3/ Michał Górny
2024-09-15 15:04 Michał Górny
2024-09-15 15:04 Michał Górny
2024-09-05  8:43 Michał Górny
2024-08-29 16:29 Michał Górny
2024-04-25  3:39 Michał Górny
2024-04-24 17:16 Sam James
2024-04-24 17:16 Sam James
2024-04-24 15:08 Michał Górny
2024-02-03 15:02 Michał Górny
2024-02-03 14:03 Arthur Zamarin
2024-02-03 13:52 Sam James
2024-01-21  6:21 Michał Górny
2024-01-21  4:29 Sam James
2024-01-21  2:44 Sam James
2024-01-15 21:24 Michał Górny
2024-01-09 16:03 Michał Górny
2024-01-03 19:49 Michał Górny
2023-12-25 20:26 Michał Górny
2023-11-02 12:58 Michał Górny
2023-09-30  8:27 Michał Górny
2023-09-26 12:31 Michał Górny
2023-07-15 18:02 Arthur Zamarin
2023-07-11  8:43 Jakov Smolić
2023-06-19  5:14 Michał Górny
2023-06-16 17:03 Michał Górny
2023-05-31 11:42 Michał Górny
2023-05-14 19:29 Michał Górny
2023-02-27  5:50 Michał Górny
2023-02-26 22:23 Sam James
2023-02-26 21:47 Sam James
2023-02-26 20:11 Michał Górny
2023-01-31 13:16 Michał Górny
2023-01-31 13:06 Arthur Zamarin
2023-01-31 13:06 Arthur Zamarin
2023-01-29  9:34 Michał Górny
2022-12-30 14:32 Michał Górny
2022-12-14 10:58 Michał Górny
2022-12-12  5:43 Michał Górny
2022-12-07 15:59 Michał Górny
2022-12-07 15:42 Sam James
2022-12-07 15:42 Sam James
2022-12-07 13:04 Michał Górny
2022-11-25 21:14 Michał Górny
2022-11-24 16:47 Michał Górny
2022-11-10 16:15 Michał Górny
2022-11-10  2:49 Sam James
2022-11-10  2:49 Sam James
2022-11-09 17:44 Michał Górny
2022-10-31 13:55 Michał Górny
2022-10-30 21:56 Sam James
2022-10-30 21:55 Sam James
2022-10-30 21:55 Sam James
2022-10-29 11:25 Michał Górny
2022-09-04 19:36 Michał Górny
2022-08-27  6:38 Michał Górny
2022-08-12 10:36 Michał Górny
2022-08-12 10:19 Agostino Sarubbo
2022-08-12 10:17 Agostino Sarubbo
2022-08-10  9:31 Michał Górny
2022-08-03  6:52 Michał Górny
2022-07-24 18:18 Michał Górny
2022-07-19 13:27 Michał Górny
2022-06-16 11:47 Michał Górny
2022-06-16  9:52 Jakov Smolić
2022-06-16  9:41 Jakov Smolić
2022-05-04 17:56 Michał Górny
2022-05-04 15:11 Jakov Smolić
2022-05-01 21:51 Jakov Smolić
2022-04-01 15:39 Michał Górny
2022-04-01 15:17 Jakov Smolić
2022-04-01  6:57 Agostino Sarubbo
2022-03-30 15:13 Michał Górny
2022-02-20 14:19 Michał Górny
2022-02-20 14:19 Michał Górny
2022-02-20 12:28 Michał Górny
2022-02-11 12:16 Michał Górny
2022-02-10 11:12 Michał Górny
2022-02-02 21:16 Michał Górny
2022-01-27 17:56 Michał Górny
2022-01-27 15:17 Michał Górny
2022-01-09  8:09 Michał Górny
2021-11-09 10:33 Michał Górny
2021-11-09  9:35 Agostino Sarubbo
2021-11-09  9:34 Agostino Sarubbo
2021-10-25 20:16 Michał Górny
2021-10-25 20:16 Michał Górny
2021-10-17 21:15 Michał Górny
2021-10-12 15:17 Michał Górny
2021-10-08  8:44 Michał Górny
2021-09-14 16:22 Michał Górny
2021-09-03  6:57 Michał Górny
2021-09-03  6:40 Agostino Sarubbo
2021-09-03  6:34 Agostino Sarubbo
2021-08-30 22:24 Michał Górny
2021-08-29 22:22 Michał Górny
2021-07-30 18:14 Michał Górny
2021-06-16 11:16 Michał Górny
2021-06-12  0:32 Sam James
2021-06-12  0:32 Sam James
2021-06-02  9:32 Michał Górny
2021-06-02  9:32 Michał Górny
2021-05-19 20:21 Michał Górny
2021-05-19 20:09 Agostino Sarubbo
2021-05-19 20:06 Agostino Sarubbo
2021-05-19 18:21 Michał Górny
2021-05-14 22:00 Michał Górny
2021-05-12  7:13 Michał Górny
2021-05-11 10:03 Agostino Sarubbo
2021-05-02  9:21 Mikle Kolyada
2021-05-01 18:19 Agostino Sarubbo
2021-04-12 13:49 Michał Górny
2021-04-10 19:36 Michał Górny
2021-04-09 11:46 Michał Górny
2021-03-15 10:37 Michał Górny
2021-03-05 20:49 Agostino Sarubbo
2021-03-05 20:48 Agostino Sarubbo
2021-03-04 15:04 Michał Górny
2021-03-04 14:56 Michał Górny
2021-03-03 18:22 Michał Górny
2021-01-09 21:59 Michał Górny
2021-01-09  2:30 Sam James
2020-12-31 23:08 Sam James
2020-11-22 11:51 Michał Górny
2020-11-22 11:51 Michał Górny
2020-11-13 12:39 Michał Górny
2020-11-13  9:02 Michał Górny
2020-09-30  2:31 Sam James
2020-09-30  2:25 Sam James
2020-09-25 12:13 Michał Górny
2020-09-25 12:13 Michał Górny
2020-09-25 12:13 Michał Górny
2020-09-17 16:56 Michał Górny
2020-09-16 22:30 Michał Górny
2020-09-16 22:30 Michał Górny
2020-09-16 22:30 Michał Górny
2020-09-11 21:05 Michał Górny
2020-09-11  9:31 Michał Górny
2020-08-30 20:31 Thomas Deutschmann
2020-08-27  5:44 Michał Górny
2020-07-02  9:52 David Seifert
2020-04-12 17:47 Michał Górny
2020-03-25 20:31 Michał Górny
2020-02-08 13:37 Mikle Kolyada
2020-01-27 15:44 Thomas Deutschmann
2020-01-17 18:35 Michał Górny
2020-01-01  9:23 Georgy Yakovlev
2019-12-30 11:59 Michał Górny
2019-12-30 11:59 Michał Górny
2019-12-25 18:38 Michał Górny
2019-12-14 13:31 Michał Górny
2019-11-20 12:27 Michał Górny
2019-08-15  8:10 Michał Górny
2019-05-24 14:21 Michał Górny
2019-04-21  6:29 Michał Górny
2019-03-28 14:22 Michał Górny
2019-02-14 22:07 Michał Górny
2019-01-05 13:39 Michał Górny
2018-08-01 12:24 Michał Górny
2018-04-29  6:33 Michał Górny
2018-04-27  6:34 Michał Górny
2018-01-14 14:38 Michał Górny
2018-01-08 19:41 Michał Górny
2017-12-27 18:20 Michał Górny
2017-11-16 12:33 Michał Górny
2017-11-12  9:27 Michał Górny
2017-11-11 15:07 Michał Górny
2017-11-05 16:23 Michał Górny
2017-11-05 16:23 Michał Górny
2017-10-15 10:09 Michał Górny
2017-10-15  7:30 Michał Górny
2017-10-15  7:14 Michał Górny
2017-06-10  9:37 Michał Górny
2017-06-09 23:10 Michał Górny
2017-06-09 23:10 Michał Górny
2017-05-30  7:34 Michał Górny
2017-05-25 18:40 Michał Górny
2017-05-25 18:40 Michał Górny
2017-04-25 21:49 Michał Górny
2017-04-25 21:49 Michał Górny
2017-04-25 21:49 Michał Górny
2017-04-25 21:49 Michał Górny
2017-04-25 21:49 Michał Górny
2017-04-25 21:49 Michał Górny
2017-04-08  5:42 Michał Górny
2017-03-08 11:32 Michał Górny
2017-03-08 11:32 Michał Górny
2016-10-12 20:59 Michał Górny
2016-07-29 15:09 Michał Górny
2016-06-09 19:46 Michał Górny
2016-05-14  9:07 Michał Górny
2016-05-14  9:07 Michał Górny
2016-03-03 10:47 Michał Górny
2016-02-06 22:45 Michał Górny

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1652773757.972df7506fdf616e2b923ad4ce44f86a607efb5c.mgorny@gentoo \
    --to=mgorny@gentoo.org \
    --cc=gentoo-commits@lists.gentoo.org \
    --cc=gentoo-dev@lists.gentoo.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox