CVS commit: pkgsrc/textproc/py-rapidfuzz

["S.P.Zeidler" <spz%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   spz
Date:           Mon Dec 25 22:20:00 UTC 2023

Modified Files:
        pkgsrc/textproc/py-rapidfuzz: Makefile PLIST

Log Message:
py-rapidfuzz: sort out simd for i386


To generate a diff of this commit:
cvs rdiff -u -r1.16 -r1.17 pkgsrc/textproc/py-rapidfuzz/Makefile
cvs rdiff -u -r1.5 -r1.6 pkgsrc/textproc/py-rapidfuzz/PLIST

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

Modified files:

Index: pkgsrc/textproc/py-rapidfuzz/Makefile
diff -u pkgsrc/textproc/py-rapidfuzz/Makefile:1.16 pkgsrc/textproc/py-rapidfuzz/Makefile:1.17
--- pkgsrc/textproc/py-rapidfuzz/Makefile:1.16  Tue Nov  7 09:14:23 2023
+++ pkgsrc/textproc/py-rapidfuzz/Makefile       Mon Dec 25 22:19:59 2023
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.16 2023/11/07 09:14:23 wiz Exp $
+# $NetBSD: Makefile,v 1.17 2023/12/25 22:19:59 spz Exp $
 
 DISTNAME=      rapidfuzz-3.5.2
 PKGNAME=       ${PYPKGPREFIX}-${DISTNAME}
@@ -21,10 +21,17 @@ PYTHON_VERSIONS_INCOMPATIBLE=       27 38
 
 PLIST_SUBST+=  PYTHON_VERSION=${_PYTHON_VERSION}
 PLIST_VARS+=   avx2
-# Only x86_64 is guaranteed to have avx2; while some i386 CPUs do, our
-# build target does not.
+PLIST_VARS+=   sse2
+# x86_64 may use avx2, i386 may use avx2 or sse2
+# docs say it'll build them in any case and then autodetect at runtime
+# whether the system supports it (using _feature_detector_cpp.so)
 .if ${MACHINE_ARCH} == "x86_64"
 PLIST.avx2=    yes
+.else
+. if ${MACHINE_ARCH} == "i386"
+PLIST.avx2=    yes
+PLIST.sse2=    yes
+. endif
 .endif
 
 USE_CXX_FEATURES=      c++17

Index: pkgsrc/textproc/py-rapidfuzz/PLIST
diff -u pkgsrc/textproc/py-rapidfuzz/PLIST:1.5 pkgsrc/textproc/py-rapidfuzz/PLIST:1.6
--- pkgsrc/textproc/py-rapidfuzz/PLIST:1.5      Tue Nov  7 09:14:23 2023
+++ pkgsrc/textproc/py-rapidfuzz/PLIST  Mon Dec 25 22:19:59 2023
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.5 2023/11/07 09:14:23 wiz Exp $
+@comment $NetBSD: PLIST,v 1.6 2023/12/25 22:19:59 spz Exp $
 ${PYSITELIB}/${WHEEL_INFODIR}/LICENSE
 ${PYSITELIB}/${WHEEL_INFODIR}/METADATA
 ${PYSITELIB}/${WHEEL_INFODIR}/RECORD
@@ -112,6 +112,7 @@ ${PYSITELIB}/rapidfuzz/distance/_initial
 ${PYSITELIB}/rapidfuzz/distance/metrics_cpp.pyi
 ${PYSITELIB}/rapidfuzz/distance/metrics_cpp.so
 ${PLIST.avx2}${PYSITELIB}/rapidfuzz/distance/metrics_cpp_avx2.so
+${PLIST.sse2}${PYSITELIB}/rapidfuzz/distance/metrics_cpp_sse2.so
 ${PYSITELIB}/rapidfuzz/distance/metrics_py.py
 ${PYSITELIB}/rapidfuzz/distance/metrics_py.pyc
 ${PYSITELIB}/rapidfuzz/distance/metrics_py.pyo
@@ -121,6 +122,7 @@ ${PYSITELIB}/rapidfuzz/fuzz.pyi
 ${PYSITELIB}/rapidfuzz/fuzz.pyo
 ${PYSITELIB}/rapidfuzz/fuzz_cpp.so
 ${PLIST.avx2}${PYSITELIB}/rapidfuzz/fuzz_cpp_avx2.so
+${PLIST.sse2}${PYSITELIB}/rapidfuzz/fuzz_cpp_sse2.so
 ${PYSITELIB}/rapidfuzz/fuzz_py.py
 ${PYSITELIB}/rapidfuzz/fuzz_py.pyc
 ${PYSITELIB}/rapidfuzz/fuzz_py.pyo