summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAvatar Heiko Becker <heirecka@exherbo.org> 2021-10-14 23:19:16 +0200
committerAvatar Heiko Becker <heirecka@exherbo.org> 2021-10-14 23:34:02 +0200
commit4487dc4986facbec8d2c6bf439083e8957f9665b (patch)
treead2707e99fdff5a02e3158797eb9bd62cb34739a
parentcc99c3089a9a481385afb17da95c11ac27826646 (diff)
downloadarbor-4487dc4986facbec8d2c6bf439083e8957f9665b.tar.gz
arbor-4487dc4986facbec8d2c6bf439083e8957f9665b.tar.xz
python:3.10: Require openssl[>=1.1.1], drop LibreSSL
Upstream dropped support for LibreSSL [1] and all LibreSSL related workarounds were dropped. While they will "not actively prohibit LibreSSL support" they will not accpet "non-trivial workarounds" or disabled tests. Not sure if we maybe want to patch that downstream, but it currently just doesn't work, so adjust to reality and drop the option. [1] https://python.domainunion.de/dev/peps/pep-0644/
-rw-r--r--packages/dev-lang/python/python-3.10.0-r1.exheres-0 (renamed from packages/dev-lang/python/python-3.10.0.exheres-0)0
-rw-r--r--packages/dev-lang/python/python-build.exlib18
2 files changed, 16 insertions, 2 deletions
diff --git a/packages/dev-lang/python/python-3.10.0.exheres-0 b/packages/dev-lang/python/python-3.10.0-r1.exheres-0
index c9d1fad8d..c9d1fad8d 100644
--- a/packages/dev-lang/python/python-3.10.0.exheres-0
+++ b/packages/dev-lang/python/python-3.10.0-r1.exheres-0
diff --git a/packages/dev-lang/python/python-build.exlib b/packages/dev-lang/python/python-build.exlib
index 6d2201415..7dd703082 100644
--- a/packages/dev-lang/python/python-build.exlib
+++ b/packages/dev-lang/python/python-build.exlib
@@ -32,9 +32,18 @@ MYOPTIONS="dbm examples readline sqlite tk
dbm? ( ( berkdb gdbm ) [[ number-selected = exactly-one ]] )
( libc: musl )
- ( providers: libressl openssl ) [[ number-selected = exactly-one ]]
"
+if ever at_least 3.10.0 ; then
+ MYOPTIONS+="
+ ( providers: openssl ) [[ number-selected = exactly-one ]]
+ "
+else
+ MYOPTIONS+="
+ ( providers: libressl openssl ) [[ number-selected = exactly-one ]]
+ "
+fi
+
DEPENDENCIES="
build:
virtual/pkg-config
@@ -55,7 +64,12 @@ DEPENDENCIES="
"
# >= 3.7.0 needs X509_VERIFY_PARAM_set1_host() provided by libressl >=2.7/openssl >=1.0.2
-if ever at_least 3.7.0; then
+if ever at_least 3.10.0; then
+ DEPENDENCIES+="
+ build+run:
+ providers:openssl? ( dev-libs/openssl:=[>=1.1.1] )
+ "
+elif ever at_least 3.7.0; then
DEPENDENCIES+="
build+run:
providers:libressl? ( dev-libs/libressl:=[>=2.7] )