Wed Jan 25 09:06:54 2023 UTC ()
py-pythran: fix building scipy


(adam)
diff -r1.9 -r1.10 pkgsrc/math/py-pythran/Makefile
diff -r1.1 -r1.2 pkgsrc/math/py-pythran/buildlink3.mk
diff -r1.6 -r1.7 pkgsrc/math/py-pythran/distinfo
diff -r0 -r1.1 pkgsrc/math/py-pythran/patches/patch-third__party_xsimd_arch_xsimd__scalar.hpp
cvs diff -r1.9 -r1.10 pkgsrc/math/py-pythran/Makefile (expand / switch to unified diff)

--- pkgsrc/math/py-pythran/Makefile 2023/01/24 09:18:23 1.9
+++ pkgsrc/math/py-pythran/Makefile 2023/01/25 09:06:54 1.10
@@ -1,31 +1,34 @@ @@ -1,31 +1,34 @@
1# $NetBSD: Makefile,v 1.9 2023/01/24 09:18:23 adam Exp $ 1# $NetBSD: Makefile,v 1.10 2023/01/25 09:06:54 adam Exp $
2 2
3DISTNAME= pythran-0.12.1 3DISTNAME= pythran-0.12.1
4PKGNAME= ${PYPKGPREFIX}-${DISTNAME} 4PKGNAME= ${PYPKGPREFIX}-${DISTNAME}
5CATEGORIES= math python 5CATEGORIES= math python
6MASTER_SITES= ${MASTER_SITE_PYPI:=p/pythran/} 6MASTER_SITES= ${MASTER_SITE_PYPI:=p/pythran/}
7 7
8MAINTAINER= pkgsrc-users@NetBSD.org 8MAINTAINER= pkgsrc-users@NetBSD.org
9HOMEPAGE= https://pythran.readthedocs.io/ 9HOMEPAGE= https://pythran.readthedocs.io/
10COMMENT= Ahead of Time compiler for numeric kernels 10COMMENT= Ahead of Time compiler for numeric kernels
11LICENSE= modified-bsd 11LICENSE= modified-bsd
12 12
13DEPENDS+= ${PYPKGPREFIX}-beniget>=0.4.0:../../devel/py-beniget 13DEPENDS+= ${PYPKGPREFIX}-beniget>=0.4.0:../../devel/py-beniget
14DEPENDS+= ${PYPKGPREFIX}-gast>=0.5.0:../../devel/py-gast 14DEPENDS+= ${PYPKGPREFIX}-gast>=0.5.0:../../devel/py-gast
15DEPENDS+= ${PYPKGPREFIX}-numpy-[0-9]*:../../math/py-numpy 15DEPENDS+= ${PYPKGPREFIX}-numpy-[0-9]*:../../math/py-numpy
16DEPENDS+= ${PYPKGPREFIX}-ply>=3.4:../../devel/py-ply 16DEPENDS+= ${PYPKGPREFIX}-ply>=3.4:../../devel/py-ply
17 17
18USE_LANGUAGES= # none 18USE_LANGUAGES= # none
19 19
20PYTHON_VERSIONS_INCOMPATIBLE= 27 20PYTHON_VERSIONS_INCOMPATIBLE= 27
21 21
22USE_PKG_RESOURCES= yes 22USE_PKG_RESOURCES= yes
23 23
 24pre-configure:
 25 ${RM} ${WRKSRC}/third_party/xsimd/arch/xsimd_scalar.hpp.orig
 26
24post-install: 27post-install:
25.for bin in pythran pythran-config 28.for bin in pythran pythran-config
26 cd ${DESTDIR}${PREFIX}/bin && \ 29 cd ${DESTDIR}${PREFIX}/bin && \
27 ${MV} ${bin} ${bin}-${PYVERSSUFFIX} || ${TRUE} 30 ${MV} ${bin} ${bin}-${PYVERSSUFFIX} || ${TRUE}
28.endfor 31.endfor
29 32
30.include "../../lang/python/egg.mk" 33.include "../../lang/python/egg.mk"
31.include "../../mk/bsd.pkg.mk" 34.include "../../mk/bsd.pkg.mk"
cvs diff -r1.1 -r1.2 pkgsrc/math/py-pythran/buildlink3.mk (expand / switch to unified diff)

--- pkgsrc/math/py-pythran/buildlink3.mk 2021/10/13 19:32:00 1.1
+++ pkgsrc/math/py-pythran/buildlink3.mk 2023/01/25 09:06:54 1.2
@@ -1,16 +1,16 @@ @@ -1,16 +1,16 @@
1# $NetBSD: buildlink3.mk,v 1.1 2021/10/13 19:32:00 adam Exp $ 1# $NetBSD: buildlink3.mk,v 1.2 2023/01/25 09:06:54 adam Exp $
2 2
3BUILDLINK_TREE+= py-pythran 3BUILDLINK_TREE+= py-pythran
4 4
5.if !defined(PY_PYTHRAN_BUILDLINK3_MK) 5.if !defined(PY_PYTHRAN_BUILDLINK3_MK)
6PY_PYTHRAN_BUILDLINK3_MK:= 6PY_PYTHRAN_BUILDLINK3_MK:=
7 7
8.include "../../lang/python/pyversion.mk" 8.include "../../lang/python/pyversion.mk"
9BUILDLINK_API_DEPENDS.py-pythran+= ${PYPKGPREFIX}-pythran>=0.10.0 9BUILDLINK_API_DEPENDS.py-pythran+= ${PYPKGPREFIX}-pythran>=0.10.0
10BUILDLINK_PKGSRCDIR.py-pythran?= ../../math/py-pythran 10BUILDLINK_PKGSRCDIR.py-pythran?= ../../math/py-pythran
11BUILDLINK_DEPMETHOD.py-pythran?= build 11BUILDLINK_DEPMETHOD.py-pythran?= build
12 12
13BUILDLINK_CONTENTS_FILTER.py-pythran+= ${EGREP} '(\.h$$|\.hpp$$)' 13BUILDLINK_CONTENTS_FILTER.py-pythran= ${EGREP} '(\.h$$|\.hpp$$)'
14.endif # PY_PYTHRAN_BUILDLINK3_MK 14.endif # PY_PYTHRAN_BUILDLINK3_MK
15 15
16BUILDLINK_TREE+= -py-pythran 16BUILDLINK_TREE+= -py-pythran
cvs diff -r1.6 -r1.7 pkgsrc/math/py-pythran/distinfo (expand / switch to unified diff)

--- pkgsrc/math/py-pythran/distinfo 2023/01/24 09:18:23 1.6
+++ pkgsrc/math/py-pythran/distinfo 2023/01/25 09:06:54 1.7
@@ -1,5 +1,6 @@ @@ -1,5 +1,6 @@
1$NetBSD: distinfo,v 1.6 2023/01/24 09:18:23 adam Exp $ 1$NetBSD: distinfo,v 1.7 2023/01/25 09:06:54 adam Exp $
2 2
3BLAKE2s (pythran-0.12.1.tar.gz) = 2e30bfd595ba4b12d43aaac62ccc329b59dc777e3a5ad484febf6235c37616dd 3BLAKE2s (pythran-0.12.1.tar.gz) = 2e30bfd595ba4b12d43aaac62ccc329b59dc777e3a5ad484febf6235c37616dd
4SHA512 (pythran-0.12.1.tar.gz) = e0a78df2c0a9b678a51ea2446588b5287a1f838e8387dd904b011b9314e61eebe0f53b6ea92107e766eebbea73ca0bdd4095a1805eb76a63cae063f82cdfa66b 4SHA512 (pythran-0.12.1.tar.gz) = e0a78df2c0a9b678a51ea2446588b5287a1f838e8387dd904b011b9314e61eebe0f53b6ea92107e766eebbea73ca0bdd4095a1805eb76a63cae063f82cdfa66b
5Size (pythran-0.12.1.tar.gz) = 3995885 bytes 5Size (pythran-0.12.1.tar.gz) = 3995885 bytes
 6SHA1 (patch-third__party_xsimd_arch_xsimd__scalar.hpp) = b7609b1575d8c5e4c8ea6c4969f8ef4ff352c20c
File Added: pkgsrc/math/py-pythran/patches/Attic/patch-third__party_xsimd_arch_xsimd__scalar.hpp
$NetBSD: patch-third__party_xsimd_arch_xsimd__scalar.hpp,v 1.1 2023/01/25 09:06:54 adam Exp $

https://github.com/serge-sans-paille/pythran/issues/2070

--- third_party/xsimd/arch/xsimd_scalar.hpp.orig	2023-01-25 08:48:11.000000000 +0000
+++ third_party/xsimd/arch/xsimd_scalar.hpp
@@ -441,7 +441,7 @@ namespace xsimd
         return !(x0 == x1);
     }
 
-#if defined(_GNU_SOURCE) && !defined(__APPLE__) && !defined(__MINGW32__) && !defined(__ANDROID__)
+#if defined(_GNU_SOURCE) && !defined(__APPLE__) && !defined(__MINGW32__) && !defined(__ANDROID__) && !defined(__FreeBSD__) && !defined(__NetBSD__) && !defined(__OpenBSD__) && !defined(__DragonFly__)
     inline float exp10(const float& x) noexcept
     {
         return ::exp10f(x);