CVS commit: pkgsrc/math/volk

["Greg Troxel" <gdt%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   gdt
Date:           Wed Mar  5 14:58:45 UTC 2025

Modified Files:
        pkgsrc/math/volk: Makefile

Log Message:
math/volk: Work around boutique cmake python-finding

volk has an included cmake fragment to find python, and while it is
supposed to find recent 3.x, that apparently gets confused by the
presence of 2.7.  After noting that lang/python/pyversion.mk contains
N ways to force the python path for various cmake idioms, add a
forcing define in math/volk's Makefile following its boutique
python-finding.

Resolves build when python2.7 is present, and likely makes it more
robust against other situations with multiple symptoms.


To generate a diff of this commit:
cvs rdiff -u -r1.18 -r1.19 pkgsrc/math/volk/Makefile

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

Modified files:

Index: pkgsrc/math/volk/Makefile
diff -u pkgsrc/math/volk/Makefile:1.18 pkgsrc/math/volk/Makefile:1.19
--- pkgsrc/math/volk/Makefile:1.18      Thu Feb 27 13:44:29 2025
+++ pkgsrc/math/volk/Makefile   Wed Mar  5 14:58:45 2025
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.18 2025/02/27 13:44:29 adam Exp $
+# $NetBSD: Makefile,v 1.19 2025/03/05 14:58:45 gdt Exp $
 
 DISTNAME=      volk-3.2.0
 CATEGORIES=    math ham
@@ -32,6 +32,10 @@ MAKE_ENV+=   DYLD_LIBRARY_PATH=${WRKSRC}/$
 .include "../../lang/python/pyversion.mk"
 PLIST_SUBST+=  PYSITELIB=${PYSITELIB}
 
+.include "../../devel/cmake/build.mk"
+# Yet another variation, for volk's boutique cmake code to find python.
+CMAKE_CONFIGURE_ARGS+=          -DPYTHON_EXECUTABLE=${TOOL_PYTHONBIN}
+
 .if    ${MACHINE_ARCH:M*arm*} ||               \
        ${MACHINE_ARCH} == "aarch64" ||         \
        ${MACHINE_ARCH} == "i386" ||            \
@@ -40,7 +44,6 @@ PLIST_SUBST+= PYSITELIB=${PYSITELIB}
        ${MACHINE_ARCH:M*powerpc*}
 .include "../../devel/cpu_features/buildlink3.mk"
 .endif
-.include "../../devel/cmake/build.mk"
 .include "../../devel/orc/buildlink3.mk"
 .include "../../devel/googletest/buildlink3.mk"
 .include "../../textproc/fmtlib/buildlink3.mk"