CVS commit: pkgsrc/math/py-pythran

["Adam Ciarcinski" <adam%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   adam
Date:           Wed Jan 25 09:06:54 UTC 2023

Modified Files:
        pkgsrc/math/py-pythran: Makefile buildlink3.mk distinfo
Added Files:
        pkgsrc/math/py-pythran/patches:
            patch-third__party_xsimd_arch_xsimd__scalar.hpp

Log Message:
py-pythran: fix building scipy


To generate a diff of this commit:
cvs rdiff -u -r1.9 -r1.10 pkgsrc/math/py-pythran/Makefile
cvs rdiff -u -r1.1 -r1.2 pkgsrc/math/py-pythran/buildlink3.mk
cvs rdiff -u -r1.6 -r1.7 pkgsrc/math/py-pythran/distinfo
cvs rdiff -u -r0 -r1.1 \
    pkgsrc/math/py-pythran/patches/patch-third__party_xsimd_arch_xsimd__scalar.hpp

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/math/py-pythran/Makefile
diff -u pkgsrc/math/py-pythran/Makefile:1.9 pkgsrc/math/py-pythran/Makefile:1.10
--- pkgsrc/math/py-pythran/Makefile:1.9 Tue Jan 24 09:18:23 2023
+++ pkgsrc/math/py-pythran/Makefile     Wed Jan 25 09:06:54 2023
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.9 2023/01/24 09:18:23 adam Exp $
+# $NetBSD: Makefile,v 1.10 2023/01/25 09:06:54 adam Exp $
 
 DISTNAME=      pythran-0.12.1
 PKGNAME=       ${PYPKGPREFIX}-${DISTNAME}
@@ -21,6 +21,9 @@ PYTHON_VERSIONS_INCOMPATIBLE= 27
 
 USE_PKG_RESOURCES=     yes
 
+pre-configure:
+       ${RM} ${WRKSRC}/third_party/xsimd/arch/xsimd_scalar.hpp.orig
+
 post-install:
 .for bin in pythran pythran-config
        cd ${DESTDIR}${PREFIX}/bin && \

Index: pkgsrc/math/py-pythran/buildlink3.mk
diff -u pkgsrc/math/py-pythran/buildlink3.mk:1.1 pkgsrc/math/py-pythran/buildlink3.mk:1.2
--- pkgsrc/math/py-pythran/buildlink3.mk:1.1    Wed Oct 13 19:32:00 2021
+++ pkgsrc/math/py-pythran/buildlink3.mk        Wed Jan 25 09:06:54 2023
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.1 2021/10/13 19:32:00 adam Exp $
+# $NetBSD: buildlink3.mk,v 1.2 2023/01/25 09:06:54 adam Exp $
 
 BUILDLINK_TREE+=       py-pythran
 
@@ -10,7 +10,7 @@ BUILDLINK_API_DEPENDS.py-pythran+=    ${PYP
 BUILDLINK_PKGSRCDIR.py-pythran?=       ../../math/py-pythran
 BUILDLINK_DEPMETHOD.py-pythran?=       build
 
-BUILDLINK_CONTENTS_FILTER.py-pythran+= ${EGREP} '(\.h$$|\.hpp$$)'
+BUILDLINK_CONTENTS_FILTER.py-pythran=  ${EGREP} '(\.h$$|\.hpp$$)'
 .endif # PY_PYTHRAN_BUILDLINK3_MK
 
 BUILDLINK_TREE+=       -py-pythran

Index: pkgsrc/math/py-pythran/distinfo
diff -u pkgsrc/math/py-pythran/distinfo:1.6 pkgsrc/math/py-pythran/distinfo:1.7
--- pkgsrc/math/py-pythran/distinfo:1.6 Tue Jan 24 09:18:23 2023
+++ pkgsrc/math/py-pythran/distinfo     Wed Jan 25 09:06:54 2023
@@ -1,5 +1,6 @@
-$NetBSD: distinfo,v 1.6 2023/01/24 09:18:23 adam Exp $
+$NetBSD: distinfo,v 1.7 2023/01/25 09:06:54 adam Exp $
 
 BLAKE2s (pythran-0.12.1.tar.gz) = 2e30bfd595ba4b12d43aaac62ccc329b59dc777e3a5ad484febf6235c37616dd
 SHA512 (pythran-0.12.1.tar.gz) = e0a78df2c0a9b678a51ea2446588b5287a1f838e8387dd904b011b9314e61eebe0f53b6ea92107e766eebbea73ca0bdd4095a1805eb76a63cae063f82cdfa66b
 Size (pythran-0.12.1.tar.gz) = 3995885 bytes
+SHA1 (patch-third__party_xsimd_arch_xsimd__scalar.hpp) = b7609b1575d8c5e4c8ea6c4969f8ef4ff352c20c

Added files:

Index: pkgsrc/math/py-pythran/patches/patch-third__party_xsimd_arch_xsimd__scalar.hpp
diff -u /dev/null pkgsrc/math/py-pythran/patches/patch-third__party_xsimd_arch_xsimd__scalar.hpp:1.1
--- /dev/null   Wed Jan 25 09:06:54 2023
+++ pkgsrc/math/py-pythran/patches/patch-third__party_xsimd_arch_xsimd__scalar.hpp      Wed Jan 25 09:06:54 2023
@@ -0,0 +1,15 @@
+$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);