pkgsrc-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[pkgsrc/trunk]: pkgsrc fighting a losing battle against the py-cryptography r...
details: https://anonhg.NetBSD.org/pkgsrc/rev/61c7a9bb7a1f
branches: trunk
changeset: 387008:61c7a9bb7a1f
user: nia <nia%pkgsrc.org@localhost>
date: Wed Oct 19 14:17:54 2022 +0000
description:
fighting a losing battle against the py-cryptography rustification, part 4
Add support for py-OpenSSL to versioned_dependencies.mk
diffstat:
lang/python/versioned_dependencies.mk | 7 ++++++-
security/py-OpenSSL/dependency.mk | 24 ++++++++++++++++++++++++
2 files changed, 30 insertions(+), 1 deletions(-)
diffs (56 lines):
diff -r 53559186cfed -r 61c7a9bb7a1f lang/python/versioned_dependencies.mk
--- a/lang/python/versioned_dependencies.mk Wed Oct 19 14:17:16 2022 +0000
+++ b/lang/python/versioned_dependencies.mk Wed Oct 19 14:17:54 2022 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: versioned_dependencies.mk,v 1.88 2022/10/19 13:42:46 nia Exp $
+# $NetBSD: versioned_dependencies.mk,v 1.89 2022/10/19 14:17:54 nia Exp $
#
# This file determines which separate distribution of a Python
# package is used as dependency, depending on the Python version
@@ -17,6 +17,7 @@
# format: short name for PYTHON_VERSIONED_DEPENDENCIES<space>Python-2.x path<space>Python-3.x path
_SUPPORTED_PACKAGES= # empty
+_SUPPORTED_PACKAGES+= OpenSSL security/py27-OpenSSL security/py-OpenSSL
_SUPPORTED_PACKAGES+= Pillow graphics/py-Pillow6 graphics/py-Pillow
_SUPPORTED_PACKAGES+= X textproc/py-X2 textproc/py-X
_SUPPORTED_PACKAGES+= cairo graphics/py-cairo118 graphics/py-cairo
@@ -53,6 +54,10 @@
# Special due to Rust handling.
_PKG_MATCHED= yes
. include "../../security/py-cryptography/dependency.mk"
+. elif "${pkg}" == "${name}" && "${pkg}" == "OpenSSL"
+# Special due to Rust handling.
+_PKG_MATCHED= yes
+. include "../../security/py-OpenSSL/dependency.mk"
. elif "${pkg}" == "${name}"
_PKG_MATCHED= yes
. if ${_PYTHON_VERSION} == 27
diff -r 53559186cfed -r 61c7a9bb7a1f security/py-OpenSSL/dependency.mk
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/security/py-OpenSSL/dependency.mk Wed Oct 19 14:17:54 2022 +0000
@@ -0,0 +1,24 @@
+# $NetBSD: dependency.mk,v 1.1 2022/10/19 14:17:54 nia Exp $
+#
+# Not for public use - use through versioned_dependencies.mk.
+#
+
+.include "../../security/py-cryptography/dependency.mk"
+
+.if ${PYCRYPTOGRAPHY_TYPE:tl} == "rust"
+PYOPENSSL_VERSION?= OpenSSL>=0
+PYOPENSSL_DIR?= security/py-OpenSSL
+.else
+PYOPENSSL_VERSION?= OpenSSL>=0<22.0.0
+PYOPENSSL_DIR?= security/py27-OpenSSL
+.endif
+
+.if "${type}" == ":build"
+BUILD_DEPENDS:= ${BUILD_DEPENDS} ${PYPKGPREFIX}-${PYOPENSSL_VERSION}:../../${PYOPENSSL_DIR}
+.elif "${type}" == ":test"
+TEST_DEPENDS:= ${TEST_DEPENDS} ${PYPKGPREFIX}-${PYOPENSSL_VERSION}:../../${PYOPENSSL_DIR}
+.elif "${type}" == ":tool"
+TOOL_DEPENDS:= ${TOOL_DEPENDS} ${PYPKGPREFIX}-${PYOPENSSL_VERSION}:../../${PYOPENSSL_DIR}
+.else
+DEPENDS:= ${DEPENDS} ${PYPKGPREFIX}-${PYOPENSSL_VERSION}:../../${PYOPENSSL_DIR}
+.endif
Home |
Main Index |
Thread Index |
Old Index