tech-pkg archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

PATCH: meson/ninja ignores MAKE_JOBS for install+test targets



While trying to build fonts/harfbuzz on a RAM starved Orange Pi, I
found that meson/ninja was rebuilding targets while in the install
phase, and was ignoring MAKE_JOBS. I didn't bother investigating
why the rebuilding was happening, but the latter I can fix.

If deemed sensible, can someone check the attached patch in?

-- 
Paul Ripke
"Great minds discuss ideas, average minds discuss events, small minds
 discuss people."
-- Disputed: Often attributed to Eleanor Roosevelt. 1948.
diff --git a/devel/meson/build.mk b/devel/meson/build.mk
index 5aec5d4b19c..5b0b57aafa2 100644
--- a/devel/meson/build.mk
+++ b/devel/meson/build.mk
@@ -38,13 +38,13 @@ meson-install:
 	if [ -f ${WRKSRC}/meson_post_install.py ]; then		\
 		${CHMOD} +x ${WRKSRC}/meson_post_install.py;	\
 	fi
-	cd ${WRKSRC} && cd ${d} && ${SETENV} ${INSTALL_ENV} ${MAKE_ENV} ninja -C output install
+	cd ${WRKSRC} && cd ${d} && ${SETENV} ${INSTALL_ENV} ${MAKE_ENV} ninja -j ${_MAKE_JOBS_N:U1} -C output install
 .endfor
 
 do-test: meson-test
 meson-test:
 .for d in ${TEST_DIRS}
-	cd ${WRKSRC} && cd ${d} && ${SETENV} ${TEST_ENV} ninja -C output test
+	cd ${WRKSRC} && cd ${d} && ${SETENV} ${TEST_ENV} ninja -j ${_MAKE_JOBS_N:U1} -C output test
 .endfor
 
 .include "../../lang/python/application.mk"


Home | Main Index | Thread Index | Old Index