diff options
| author | wiz <wiz@pkgsrc.org> | 2022-01-25 13:12:49 +0000 |
|---|---|---|
| committer | wiz <wiz@pkgsrc.org> | 2022-01-25 13:12:49 +0000 |
| commit | 0162265a26189d57a3bd0889f27a73a7c9cd1529 (patch) | |
| tree | 4ed6e47b5204c25a62165e90505bc7a36d4879b8 | |
| parent | 2fc480ba417e179183d3d77dbd68f88c8fd7836e (diff) | |
| download | pkgsrc-0162265a26189d57a3bd0889f27a73a7c9cd1529.tar.gz | |
py-olm: fix build for python 2.7
Also remove python 3.6 patch; that python version is not in pkgsrc
any longer.
| -rw-r--r-- | security/py-olm/Makefile | 8 | ||||
| -rw-r--r-- | security/py-olm/PLIST | 5 | ||||
| -rw-r--r-- | security/py-olm/distinfo | 3 | ||||
| -rw-r--r-- | security/py-olm/patches/patch-setup.py | 16 |
4 files changed, 11 insertions, 21 deletions
diff --git a/security/py-olm/Makefile b/security/py-olm/Makefile index 539e8989018..18c4f05c9ea 100644 --- a/security/py-olm/Makefile +++ b/security/py-olm/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.1 2022/01/25 12:59:39 ryoon Exp $ +# $NetBSD: Makefile,v 1.2 2022/01/25 13:12:49 wiz Exp $ DISTNAME= olm-3.2.10 PKGNAME= ${PYPKGPREFIX}-${DISTNAME} @@ -15,6 +15,12 @@ WRKSRC= ${WRKDIR}/${DISTNAME}/python DEPENDS+= ${PYPKGPREFIX}-future>=0.18.2:../../devel/py-future DEPENDS+= ${PYPKGPREFIX}-cffi>=1.0.0:../../devel/py-cffi +.include "../../lang/python/pyversion.mk" + +.if ${PYPKGPREFIX} == "py27" +DEPENDS+= ${PYPKGPREFIX}-typing-[0-9]*:../../devel/py-typing +.endif + .include "../../security/olm/buildlink3.mk" .include "../../lang/python/egg.mk" .include "../../mk/bsd.pkg.mk" diff --git a/security/py-olm/PLIST b/security/py-olm/PLIST index b498481edae..86ca055a013 100644 --- a/security/py-olm/PLIST +++ b/security/py-olm/PLIST @@ -1,5 +1,6 @@ -@comment $NetBSD: PLIST,v 1.1 2022/01/25 12:59:39 ryoon Exp $ -${PYSITELIB}/_libolm.abi3.so +@comment $NetBSD: PLIST,v 1.2 2022/01/25 13:12:49 wiz Exp $ +${PLIST.py2x}${PYSITELIB}/_libolm.so +${PLIST.py3x}${PYSITELIB}/_libolm.abi3.so ${PYSITELIB}/olm/__init__.py ${PYSITELIB}/olm/__init__.pyc ${PYSITELIB}/olm/__init__.pyo diff --git a/security/py-olm/distinfo b/security/py-olm/distinfo index 0be8117e66e..d8511df9b72 100644 --- a/security/py-olm/distinfo +++ b/security/py-olm/distinfo @@ -1,6 +1,5 @@ -$NetBSD: distinfo,v 1.1 2022/01/25 12:59:39 ryoon Exp $ +$NetBSD: distinfo,v 1.2 2022/01/25 13:12:49 wiz Exp $ BLAKE2s (olm-3.2.10.tar.gz) = 888b76d7543eca0316cc447232836e3a2ce7e0acebf63a1ad7944c4893805e26 SHA512 (olm-3.2.10.tar.gz) = e4b4e1a4b5afbf537780db21a7639609581f9be7f52d8bec572db38e9e2bae43138c1214aa23a87fb5c66f3ce47f566950c9689b27426ea894afa444fc3829c7 Size (olm-3.2.10.tar.gz) = 2894343 bytes -SHA1 (patch-setup.py) = 3ee82830e1bf0a69b455d68efc49e67b6215aada diff --git a/security/py-olm/patches/patch-setup.py b/security/py-olm/patches/patch-setup.py deleted file mode 100644 index 0d3d33bb262..00000000000 --- a/security/py-olm/patches/patch-setup.py +++ /dev/null @@ -1,16 +0,0 @@ -$NetBSD: patch-setup.py,v 1.1 2022/01/25 12:59:39 ryoon Exp $ - -Avoid locale-based exceptions when building for Python 3.6. - ---- setup.py.orig 2021-08-25 01:40:01.730815286 +0000 -+++ setup.py -@@ -4,6 +4,9 @@ import os - from codecs import open - - from setuptools import setup -+import locale -+ -+locale.setlocale(locale.LC_ALL, 'en_US.UTF-8') - - here = os.path.abspath(os.path.dirname(__file__)) - |