CVS commit: pkgsrc/devel/py-dm-tree

["Taylor R Campbell" <riastradh%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   riastradh
Date:           Fri Jan 24 08:02:28 UTC 2025

Modified Files:
        pkgsrc/devel/py-dm-tree: Makefile

Log Message:
devel/py-dm-tree: Fix jobs.

1. Use MAKE_JOBS, not the number of CPUs Python detects.

2. Explicitly use tool gmake, which this seems to assume of `make'.

Should resolve, with (e.g.) MAKE_JOBS=4:

-- Build files have been written to: /tmp/pkgbuild/2024Q4/devel/py-dm-tree/work/dm-tree-0.1.8/build/temp.netbsd-9.0-amd64-cpython-310
[ 50%] Building CXX object CMakeFiles/_tree.dir/tree.cc.o
[100%] Linking CXX shared module /tmp/pkgbuild/2024Q4/devel/py-dm-tree/work/dm-tree-0.1.8/build/lib.netbsd-9.0-amd64-cpython-310/tree/_tree.so
make[3]: argument 'observer-auth=fifo:/var/tmp//GMfifo2063' to option '-j' must be a positive number
lto-wrapper: fatal error: make returned 2 exit status
...
subprocess.CalledProcessError: Command '['cmake', '--build', '.', '-j24', '--config', 'Release']' returned non-zero exit status 2.

Should be no change if the build succeeds, so no revbump.


To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 pkgsrc/devel/py-dm-tree/Makefile

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

Modified files:

Index: pkgsrc/devel/py-dm-tree/Makefile
diff -u pkgsrc/devel/py-dm-tree/Makefile:1.2 pkgsrc/devel/py-dm-tree/Makefile:1.3
--- pkgsrc/devel/py-dm-tree/Makefile:1.2        Mon Nov 11 07:28:06 2024
+++ pkgsrc/devel/py-dm-tree/Makefile    Fri Jan 24 08:02:28 2025
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 2024/11/11 07:28:06 wiz Exp $
+# $NetBSD: Makefile,v 1.3 2025/01/24 08:02:28 riastradh Exp $
 
 DISTNAME=      dm-tree-0.1.8
 PKGNAME=       ${PYPKGPREFIX}-${DISTNAME}
@@ -18,7 +18,13 @@ TEST_DEPENDS+=       ${PYPKGPREFIX}-wrapt>=1.1
 
 USE_CXX_FEATURES=      c++14
 USE_LANGUAGES=         c++
-USE_TOOLS+=            cmake
+USE_TOOLS+=            cmake gmake
+
+SUBST_CLASSES+=                jobs
+SUBST_MESSAGE.jobs=    Limit parallelism to MAKE_JOBS
+SUBST_STAGE.jobs=      pre-configure
+SUBST_FILES.jobs=      setup.py
+SUBST_SED.jobs=                -e 's,-j{os.cpu_count()},-j${MAKE_JOBS:U1},'
 
 PYTHON_VERSIONS_INCOMPATIBLE=  27