commit: d29364fcbaba14f5a640ea6b86462eace25483d0 Author: orbea <orbea <AT> riseup <DOT> net> AuthorDate: Sat Jun 18 20:42:25 2022 +0000 Commit: Quentin Retornaz <gentoo <AT> retornaz <DOT> com> CommitDate: Sun Jun 19 04:03:30 2022 +0000 URL: https://gitweb.gentoo.org/repo/proj/libressl.git/commit/?id=d29364fc
dev-lang/python: Merge changes from ::gentoo Signed-off-by: orbea <orbea <AT> riseup.net> Closes: https://github.com/gentoo/libressl/pull/423 Signed-off-by: Quentin Retornaz <gentoo <AT> retornaz.com> dev-lang/python/metadata.xml | 5 ++++- dev-lang/python/python-3.10.4.ebuild | 8 ++++---- dev-lang/python/python-3.9.12.ebuild | 8 ++++---- 3 files changed, 12 insertions(+), 9 deletions(-) diff --git a/dev-lang/python/metadata.xml b/dev-lang/python/metadata.xml index cae26a6..54c2aa9 100644 --- a/dev-lang/python/metadata.xml +++ b/dev-lang/python/metadata.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd";> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd";> <pkgmetadata> <maintainer type="project"> <email>[email protected]</email> @@ -7,6 +7,9 @@ </maintainer> <use> <flag name="bluetooth">Build Bluetooth protocol support in socket module</flag> + <flag name="libedit">Link readline extension against <pkg>dev-libs/libedit</pkg> instead of <pkg>sys-libs/readline</pkg>.</flag> + <flag name="pgo">Optimize the build using Profile Guided Optimization (PGO)</flag> + <flag name="lto">Optimize the build using Link Time Optimization (LTO)</flag> <flag name="wininst">Install Windows executables required to create an executable installer for MS Windows.</flag> </use> </pkgmetadata> diff --git a/dev-lang/python/python-3.10.4.ebuild b/dev-lang/python/python-3.10.4.ebuild index 8288304..7b39aaa 100644 --- a/dev-lang/python/python-3.10.4.ebuild +++ b/dev-lang/python/python-3.10.4.ebuild @@ -25,7 +25,7 @@ S="${WORKDIR}/${MY_P}" LICENSE="PSF-2" SLOT="${PYVER}" -KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86" +KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86" IUSE="bluetooth build examples gdbm hardened libedit lto +ncurses pgo +readline +sqlite +ssl test tk wininst +xml" RESTRICT="!test? ( test )" @@ -83,6 +83,8 @@ VERIFY_SIG_OPENPGP_KEY_PATH=${BROOT}/usr/share/openpgp-keys/python.org.asc # large file tests involve a 2.5G file being copied (duplicated) CHECKREQS_DISK_BUILD=5500M +QA_PKGCONFIG_VERSION=${PYVER} + pkg_pretend() { use test && check-reqs_pkg_pretend } @@ -146,9 +148,7 @@ src_configure() { einfo "Disabled modules: ${PYTHON_DISABLE_MODULES}" fi - if [[ "$(gcc-major-version)" -ge 4 ]]; then - append-flags -fwrapv - fi + append-flags -fwrapv filter-flags -malign-double diff --git a/dev-lang/python/python-3.9.12.ebuild b/dev-lang/python/python-3.9.12.ebuild index d49fc15..e45953a 100644 --- a/dev-lang/python/python-3.9.12.ebuild +++ b/dev-lang/python/python-3.9.12.ebuild @@ -25,7 +25,7 @@ S="${WORKDIR}/${MY_P}" LICENSE="PSF-2" SLOT="${PYVER}" -KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc ~x86" +KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86" IUSE="bluetooth build examples gdbm hardened lto +ncurses pgo +readline +sqlite +ssl test tk wininst +xml" RESTRICT="!test? ( test )" @@ -78,6 +78,8 @@ VERIFY_SIG_OPENPGP_KEY_PATH=${BROOT}/usr/share/openpgp-keys/python.org.asc # large file tests involve a 2.5G file being copied (duplicated) CHECKREQS_DISK_BUILD=5500M +QA_PKGCONFIG_VERSION=${PYVER} + pkg_pretend() { use test && check-reqs_pkg_pretend } @@ -143,9 +145,7 @@ src_configure() { einfo "Disabled modules: ${PYTHON_DISABLE_MODULES}" fi - if [[ "$(gcc-major-version)" -ge 4 ]]; then - append-flags -fwrapv - fi + append-flags -fwrapv filter-flags -malign-double
