Tue Jul 18 18:30:01 2023 UTC ()
math: Adapt packages to USE_(CC|CXX)_FEATURES where possible


(nia)
diff -r1.9 -r1.10 pkgsrc/math/imath/Makefile
diff -r1.7 -r1.8 pkgsrc/math/openfst/Makefile
diff -r1.15 -r1.16 pkgsrc/math/volk/Makefile
cvs diff -r1.9 -r1.10 pkgsrc/math/imath/Makefile (expand / switch to unified diff)

--- pkgsrc/math/imath/Makefile 2023/06/06 08:01:09 1.9
+++ pkgsrc/math/imath/Makefile 2023/07/18 18:30:01 1.10
@@ -1,24 +1,23 @@ @@ -1,24 +1,23 @@
1# $NetBSD: Makefile,v 1.9 2023/06/06 08:01:09 wiz Exp $ 1# $NetBSD: Makefile,v 1.10 2023/07/18 18:30:01 nia Exp $
2 2
3DISTNAME= imath-3.1.9 3DISTNAME= imath-3.1.9
4CATEGORIES= math 4CATEGORIES= math
5MASTER_SITES= ${MASTER_SITE_GITHUB:=AcademySoftwareFoundation/} 5MASTER_SITES= ${MASTER_SITE_GITHUB:=AcademySoftwareFoundation/}
6GITHUB_PROJECT= Imath 6GITHUB_PROJECT= Imath
7GITHUB_TAG= v${PKGVERSION_NOREV} 7GITHUB_TAG= v${PKGVERSION_NOREV}
8 8
9MAINTAINER= pkgsrc-users@NetBSD.org 9MAINTAINER= pkgsrc-users@NetBSD.org
10HOMEPAGE= https://www.openexr.com/ 10HOMEPAGE= https://www.openexr.com/
11COMMENT= 2D and 3D vector, matrix, and math operations for computer graphics 11COMMENT= 2D and 3D vector, matrix, and math operations for computer graphics
12LICENSE= modified-bsd 12LICENSE= modified-bsd
13 13
14USE_LANGUAGES= c c++14 14USE_LANGUAGES= c c++14
15PTHREAD_OPTS= require 15PTHREAD_OPTS= require
16 16
17# C++14 17USE_CXX_FEATURES+= c++14
18GCC_REQD+= 6 
19 18
20PKGCONFIG_OVERRIDE= config/Imath.pc.in 19PKGCONFIG_OVERRIDE= config/Imath.pc.in
21 20
22.include "../../devel/cmake/build.mk" 21.include "../../devel/cmake/build.mk"
23.include "../../mk/pthread.buildlink3.mk" 22.include "../../mk/pthread.buildlink3.mk"
24.include "../../mk/bsd.pkg.mk" 23.include "../../mk/bsd.pkg.mk"
cvs diff -r1.7 -r1.8 pkgsrc/math/openfst/Makefile (expand / switch to unified diff)

--- pkgsrc/math/openfst/Makefile 2022/10/11 16:35:49 1.7
+++ pkgsrc/math/openfst/Makefile 2023/07/18 18:30:01 1.8
@@ -1,19 +1,20 @@ @@ -1,19 +1,20 @@
1# $NetBSD: Makefile,v 1.7 2022/10/11 16:35:49 nros Exp $ 1# $NetBSD: Makefile,v 1.8 2023/07/18 18:30:01 nia Exp $
2 2
3DISTNAME= openfst-1.8.2 3DISTNAME= openfst-1.8.2
4CATEGORIES= math 4CATEGORIES= math
5MASTER_SITES= http://www.openfst.org/twiki/pub/FST/FstDownload/ 5MASTER_SITES= http://www.openfst.org/twiki/pub/FST/FstDownload/
6 6
7MAINTAINER= pallegra@gmail.com 7MAINTAINER= pallegra@gmail.com
8HOMEPAGE= http://www.openfst.org/ 8HOMEPAGE= http://www.openfst.org/
9COMMENT= Library for manipulating transducers 9COMMENT= Library for manipulating transducers
10LICENSE= apache-2.0 10LICENSE= apache-2.0
11 11
12USE_LANGUAGES= c c++17 12USE_LANGUAGES= c c++
13USE_LIBTOOL= yes 13USE_LIBTOOL= yes
14GNU_CONFIGURE= yes 14GNU_CONFIGURE= yes
15GCC_REQD+= 8 # needs <charconv> for from_chars 15
 16USE_CXX_FEATURES+= c++17 charconv
16 17
17.include "../../mk/dlopen.buildlink3.mk" 18.include "../../mk/dlopen.buildlink3.mk"
18BUILDLINK_TRANSFORM+= opt:-ldl:${BUILDLINK_LDADD.dl:M*} 19BUILDLINK_TRANSFORM+= opt:-ldl:${BUILDLINK_LDADD.dl:M*}
19.include "../../mk/bsd.pkg.mk" 20.include "../../mk/bsd.pkg.mk"
cvs diff -r1.15 -r1.16 pkgsrc/math/volk/Makefile (expand / switch to unified diff)

--- pkgsrc/math/volk/Makefile 2023/06/06 12:41:53 1.15
+++ pkgsrc/math/volk/Makefile 2023/07/18 18:30:01 1.16
@@ -1,34 +1,35 @@ @@ -1,34 +1,35 @@
1# $NetBSD: Makefile,v 1.15 2023/06/06 12:41:53 riastradh Exp $ 1# $NetBSD: Makefile,v 1.16 2023/07/18 18:30:01 nia Exp $
2 2
3DISTNAME= volk-2.5.2 3DISTNAME= volk-2.5.2
4CATEGORIES= math ham 4CATEGORIES= math ham
5MASTER_SITES= ${MASTER_SITE_GITHUB:=gnuradio/} 5MASTER_SITES= ${MASTER_SITE_GITHUB:=gnuradio/}
6GITHUB_RELEASE= v${PKGVERSION_NOREV} 6GITHUB_RELEASE= v${PKGVERSION_NOREV}
7EXTRACT_SUFX= .tar.xz 7EXTRACT_SUFX= .tar.xz
8 8
9MAINTAINER= pkgsrc-users@NetBSD.org 9MAINTAINER= pkgsrc-users@NetBSD.org
10HOMEPAGE= https://www.libvolk.org/ 10HOMEPAGE= https://www.libvolk.org/
11COMMENT= The Vector Optimized Library of Kernels 11COMMENT= The Vector Optimized Library of Kernels
12LICENSE= gnu-gpl-v3 12LICENSE= gnu-gpl-v3
13 13
14TOOL_DEPENDS+= ${PYPKGPREFIX}-mako-[0-9]*:../../devel/py-mako 14TOOL_DEPENDS+= ${PYPKGPREFIX}-mako-[0-9]*:../../devel/py-mako
15 15
16GCC_REQD+= 8 # std::filesystem 
17USE_CMAKE= yes 16USE_CMAKE= yes
18USE_LANGUAGES= c c++17 17USE_LANGUAGES= c c++
19USE_TOOLS+= pkg-config 18USE_TOOLS+= pkg-config
20TEST_TARGET= test 19TEST_TARGET= test
21 20
 21USE_CXX_FEATURES+= c++17 filesystem
 22
22PYTHON_VERSIONS_INCOMPATIBLE= 27 # py-mako 23PYTHON_VERSIONS_INCOMPATIBLE= 27 # py-mako
23 24
24# XXX this doesn't work because VolkPython.cmake doesn't conform 25# XXX this doesn't work because VolkPython.cmake doesn't conform
25# to PEP 3147 (doesn't place files in __pycache__ when using python 3) 26# to PEP 3147 (doesn't place files in __pycache__ when using python 3)
26# 27#
27# PY_PATCHPLIST= yes 28# PY_PATCHPLIST= yes
28#.include "../../lang/python/extension.mk" 29#.include "../../lang/python/extension.mk"
29# 30#
30# So do it manually instead: 31# So do it manually instead:
31.include "../../lang/python/pyversion.mk" 32.include "../../lang/python/pyversion.mk"
32PLIST_SUBST+= PYSITELIB=${PYSITELIB} 33PLIST_SUBST+= PYSITELIB=${PYSITELIB}
33 34
34.include "../../devel/orc/buildlink3.mk" 35.include "../../devel/orc/buildlink3.mk"