Mon Dec 25 22:20:00 2023 UTC (154d)
py-rapidfuzz: sort out simd for i386


(spz)
diff -r1.16 -r1.17 pkgsrc/textproc/py-rapidfuzz/Makefile
diff -r1.5 -r1.6 pkgsrc/textproc/py-rapidfuzz/PLIST
cvs diff -r1.16 -r1.17 pkgsrc/textproc/py-rapidfuzz/Makefile (expand / switch to unified diff)

--- pkgsrc/textproc/py-rapidfuzz/Makefile 2023/11/07 09:14:23 1.16
+++ pkgsrc/textproc/py-rapidfuzz/Makefile 2023/12/25 22:19:59 1.17
@@ -1,37 +1,44 @@ @@ -1,37 +1,44 @@
1# $NetBSD: Makefile,v 1.16 2023/11/07 09:14:23 wiz Exp $ 1# $NetBSD: Makefile,v 1.17 2023/12/25 22:19:59 spz Exp $
2 2
3DISTNAME= rapidfuzz-3.5.2 3DISTNAME= rapidfuzz-3.5.2
4PKGNAME= ${PYPKGPREFIX}-${DISTNAME} 4PKGNAME= ${PYPKGPREFIX}-${DISTNAME}
5CATEGORIES= textproc python 5CATEGORIES= textproc python
6MASTER_SITES= ${MASTER_SITE_PYPI:=r/rapidfuzz/} 6MASTER_SITES= ${MASTER_SITE_PYPI:=r/rapidfuzz/}
7 7
8MAINTAINER= pkgsrc-users@NetBSD.org 8MAINTAINER= pkgsrc-users@NetBSD.org
9HOMEPAGE= https://github.com/maxbachmann/RapidFuzz 9HOMEPAGE= https://github.com/maxbachmann/RapidFuzz
10COMMENT= Rapid fuzzy string matching 10COMMENT= Rapid fuzzy string matching
11LICENSE= mit 11LICENSE= mit
12 12
13TOOL_DEPENDS+= cmake-[0-9]*:../../devel/cmake 13TOOL_DEPENDS+= cmake-[0-9]*:../../devel/cmake
14TOOL_DEPENDS+= ${PYPKGPREFIX}-scikit-build>=0.17.0:../../devel/py-scikit-build 14TOOL_DEPENDS+= ${PYPKGPREFIX}-scikit-build>=0.17.0:../../devel/py-scikit-build
15TEST_DEPENDS+= ${PYPKGPREFIX}-test>=7.1:../../devel/py-test 15TEST_DEPENDS+= ${PYPKGPREFIX}-test>=7.1:../../devel/py-test
16# optional dependency, but not optional for testing 16# optional dependency, but not optional for testing
17TEST_DEPENDS+= ${PYPKGPREFIX}-numpy>=0:../../math/py-numpy 17TEST_DEPENDS+= ${PYPKGPREFIX}-numpy>=0:../../math/py-numpy
18TEST_DEPENDS+= ${PYPKGPREFIX}-hypothesis>=0:../../devel/py-hypothesis 18TEST_DEPENDS+= ${PYPKGPREFIX}-hypothesis>=0:../../devel/py-hypothesis
19 19
20PYTHON_VERSIONS_INCOMPATIBLE= 27 38 20PYTHON_VERSIONS_INCOMPATIBLE= 27 38
21 21
22PLIST_SUBST+= PYTHON_VERSION=${_PYTHON_VERSION} 22PLIST_SUBST+= PYTHON_VERSION=${_PYTHON_VERSION}
23PLIST_VARS+= avx2 23PLIST_VARS+= avx2
24# Only x86_64 is guaranteed to have avx2; while some i386 CPUs do, our 24PLIST_VARS+= sse2
25# build target does not. 25# x86_64 may use avx2, i386 may use avx2 or sse2
 26# docs say it'll build them in any case and then autodetect at runtime
 27# whether the system supports it (using _feature_detector_cpp.so)
26.if ${MACHINE_ARCH} == "x86_64" 28.if ${MACHINE_ARCH} == "x86_64"
27PLIST.avx2= yes 29PLIST.avx2= yes
 30.else
 31. if ${MACHINE_ARCH} == "i386"
 32PLIST.avx2= yes
 33PLIST.sse2= yes
 34. endif
28.endif 35.endif
29 36
30USE_CXX_FEATURES= c++17 37USE_CXX_FEATURES= c++17
31USE_LANGUAGES= c c++ 38USE_LANGUAGES= c c++
32GCC_REQD+= 10 39GCC_REQD+= 10
33 40
34BUILDLINK_TRANSFORM.SunOS+= rm:-fno-fat-lto-objects 41BUILDLINK_TRANSFORM.SunOS+= rm:-fno-fat-lto-objects
35 42
36.include "../../lang/python/wheel.mk" 43.include "../../lang/python/wheel.mk"
37.include "../../mk/bsd.pkg.mk" 44.include "../../mk/bsd.pkg.mk"
cvs diff -r1.5 -r1.6 pkgsrc/textproc/py-rapidfuzz/PLIST (expand / switch to unified diff)

--- pkgsrc/textproc/py-rapidfuzz/PLIST 2023/11/07 09:14:23 1.5
+++ pkgsrc/textproc/py-rapidfuzz/PLIST 2023/12/25 22:19:59 1.6
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1@comment $NetBSD: PLIST,v 1.5 2023/11/07 09:14:23 wiz Exp $ 1@comment $NetBSD: PLIST,v 1.6 2023/12/25 22:19:59 spz Exp $
2${PYSITELIB}/${WHEEL_INFODIR}/LICENSE 2${PYSITELIB}/${WHEEL_INFODIR}/LICENSE
3${PYSITELIB}/${WHEEL_INFODIR}/METADATA 3${PYSITELIB}/${WHEEL_INFODIR}/METADATA
4${PYSITELIB}/${WHEEL_INFODIR}/RECORD 4${PYSITELIB}/${WHEEL_INFODIR}/RECORD
5${PYSITELIB}/${WHEEL_INFODIR}/WHEEL 5${PYSITELIB}/${WHEEL_INFODIR}/WHEEL
6${PYSITELIB}/${WHEEL_INFODIR}/entry_points.txt 6${PYSITELIB}/${WHEEL_INFODIR}/entry_points.txt
7${PYSITELIB}/${WHEEL_INFODIR}/top_level.txt 7${PYSITELIB}/${WHEEL_INFODIR}/top_level.txt
8${PYSITELIB}/rapidfuzz/__init__.pxd 8${PYSITELIB}/rapidfuzz/__init__.pxd
9${PYSITELIB}/rapidfuzz/__init__.py 9${PYSITELIB}/rapidfuzz/__init__.py
10${PYSITELIB}/rapidfuzz/__init__.pyc 10${PYSITELIB}/rapidfuzz/__init__.pyc
11${PYSITELIB}/rapidfuzz/__init__.pyi 11${PYSITELIB}/rapidfuzz/__init__.pyi
12${PYSITELIB}/rapidfuzz/__init__.pyo 12${PYSITELIB}/rapidfuzz/__init__.pyo
13${PYSITELIB}/rapidfuzz/__pyinstaller/__init__.py 13${PYSITELIB}/rapidfuzz/__pyinstaller/__init__.py
14${PYSITELIB}/rapidfuzz/__pyinstaller/__init__.pyc 14${PYSITELIB}/rapidfuzz/__pyinstaller/__init__.pyc
@@ -102,35 +102,37 @@ ${PYSITELIB}/rapidfuzz/distance/__init__ @@ -102,35 +102,37 @@ ${PYSITELIB}/rapidfuzz/distance/__init__
102${PYSITELIB}/rapidfuzz/distance/__init__.pyi 102${PYSITELIB}/rapidfuzz/distance/__init__.pyi
103${PYSITELIB}/rapidfuzz/distance/__init__.pyo 103${PYSITELIB}/rapidfuzz/distance/__init__.pyo
104${PYSITELIB}/rapidfuzz/distance/_initialize.py 104${PYSITELIB}/rapidfuzz/distance/_initialize.py
105${PYSITELIB}/rapidfuzz/distance/_initialize.pyc 105${PYSITELIB}/rapidfuzz/distance/_initialize.pyc
106${PYSITELIB}/rapidfuzz/distance/_initialize.pyi 106${PYSITELIB}/rapidfuzz/distance/_initialize.pyi
107${PYSITELIB}/rapidfuzz/distance/_initialize.pyo 107${PYSITELIB}/rapidfuzz/distance/_initialize.pyo
108${PYSITELIB}/rapidfuzz/distance/_initialize_cpp.so 108${PYSITELIB}/rapidfuzz/distance/_initialize_cpp.so
109${PYSITELIB}/rapidfuzz/distance/_initialize_py.py 109${PYSITELIB}/rapidfuzz/distance/_initialize_py.py
110${PYSITELIB}/rapidfuzz/distance/_initialize_py.pyc 110${PYSITELIB}/rapidfuzz/distance/_initialize_py.pyc
111${PYSITELIB}/rapidfuzz/distance/_initialize_py.pyo 111${PYSITELIB}/rapidfuzz/distance/_initialize_py.pyo
112${PYSITELIB}/rapidfuzz/distance/metrics_cpp.pyi 112${PYSITELIB}/rapidfuzz/distance/metrics_cpp.pyi
113${PYSITELIB}/rapidfuzz/distance/metrics_cpp.so 113${PYSITELIB}/rapidfuzz/distance/metrics_cpp.so
114${PLIST.avx2}${PYSITELIB}/rapidfuzz/distance/metrics_cpp_avx2.so 114${PLIST.avx2}${PYSITELIB}/rapidfuzz/distance/metrics_cpp_avx2.so
 115${PLIST.sse2}${PYSITELIB}/rapidfuzz/distance/metrics_cpp_sse2.so
115${PYSITELIB}/rapidfuzz/distance/metrics_py.py 116${PYSITELIB}/rapidfuzz/distance/metrics_py.py
116${PYSITELIB}/rapidfuzz/distance/metrics_py.pyc 117${PYSITELIB}/rapidfuzz/distance/metrics_py.pyc
117${PYSITELIB}/rapidfuzz/distance/metrics_py.pyo 118${PYSITELIB}/rapidfuzz/distance/metrics_py.pyo
118${PYSITELIB}/rapidfuzz/fuzz.py 119${PYSITELIB}/rapidfuzz/fuzz.py
119${PYSITELIB}/rapidfuzz/fuzz.pyc 120${PYSITELIB}/rapidfuzz/fuzz.pyc
120${PYSITELIB}/rapidfuzz/fuzz.pyi 121${PYSITELIB}/rapidfuzz/fuzz.pyi
121${PYSITELIB}/rapidfuzz/fuzz.pyo 122${PYSITELIB}/rapidfuzz/fuzz.pyo
122${PYSITELIB}/rapidfuzz/fuzz_cpp.so 123${PYSITELIB}/rapidfuzz/fuzz_cpp.so
123${PLIST.avx2}${PYSITELIB}/rapidfuzz/fuzz_cpp_avx2.so 124${PLIST.avx2}${PYSITELIB}/rapidfuzz/fuzz_cpp_avx2.so
 125${PLIST.sse2}${PYSITELIB}/rapidfuzz/fuzz_cpp_sse2.so
124${PYSITELIB}/rapidfuzz/fuzz_py.py 126${PYSITELIB}/rapidfuzz/fuzz_py.py
125${PYSITELIB}/rapidfuzz/fuzz_py.pyc 127${PYSITELIB}/rapidfuzz/fuzz_py.pyc
126${PYSITELIB}/rapidfuzz/fuzz_py.pyo 128${PYSITELIB}/rapidfuzz/fuzz_py.pyo
127${PYSITELIB}/rapidfuzz/process.py 129${PYSITELIB}/rapidfuzz/process.py
128${PYSITELIB}/rapidfuzz/process.pyc 130${PYSITELIB}/rapidfuzz/process.pyc
129${PYSITELIB}/rapidfuzz/process.pyi 131${PYSITELIB}/rapidfuzz/process.pyi
130${PYSITELIB}/rapidfuzz/process.pyo 132${PYSITELIB}/rapidfuzz/process.pyo
131${PYSITELIB}/rapidfuzz/process_cpp.py 133${PYSITELIB}/rapidfuzz/process_cpp.py
132${PYSITELIB}/rapidfuzz/process_cpp.pyc 134${PYSITELIB}/rapidfuzz/process_cpp.pyc
133${PYSITELIB}/rapidfuzz/process_cpp.pyo 135${PYSITELIB}/rapidfuzz/process_cpp.pyo
134${PYSITELIB}/rapidfuzz/process_cpp_impl.pyi 136${PYSITELIB}/rapidfuzz/process_cpp_impl.pyi
135${PYSITELIB}/rapidfuzz/process_cpp_impl.so 137${PYSITELIB}/rapidfuzz/process_cpp_impl.so
136${PYSITELIB}/rapidfuzz/process_py.py 138${PYSITELIB}/rapidfuzz/process_py.py