This is an automated email from the git hooks/post-receive script. guillem pushed a commit to branch main in repository dpkg.
View the commit online: https://git.dpkg.org/cgit/dpkg/dpkg.git/commit/?id=61f824cf17ca87db571f2754207726aae78986cd commit 61f824cf17ca87db571f2754207726aae78986cd Author: Nicolas Boulenguez <[email protected]> AuthorDate: Tue Apr 9 05:31:16 2024 +0200 scripts/mk: Search once for parrallel= in DEB_BUILD_OPTIONS Previously each expansion of DEB_BUILD_OPTION_PARALLEL was parsing DEB_BUILD_OPTIONS. Signed-off-by: Guillem Jover <[email protected]> --- scripts/mk/buildopts.mk | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/scripts/mk/buildopts.mk b/scripts/mk/buildopts.mk index 73cb55aca..734d55e02 100644 --- a/scripts/mk/buildopts.mk +++ b/scripts/mk/buildopts.mk @@ -4,12 +4,16 @@ # Defines the following variables: # # DEB_BUILD_OPTION_PARALLEL: the argument for the parallel=N option. +# $(DEB_BUILD_OPTIONS) "parallel=2" "parallel=" "" +# $(DEB_BUILD_OPTION_PARALLEL) "2" "" unset +# $(DEB_BUILD_OPTION_PARALLEL:%=-j%) "-j2" "" "" ifndef dpkg_buildopts_mk_included dpkg_buildopts_mk_included = yes -ifneq (,$(filter parallel=%,$(DEB_BUILD_OPTIONS))) - DEB_BUILD_OPTION_PARALLEL = $(patsubst parallel=%,%,$(filter parallel=%,$(DEB_BUILD_OPTIONS))) +dpkg_buildopts_parallel := $(filter parallel=%,$(DEB_BUILD_OPTIONS)) +ifdef dpkg_buildopts_parallel + DEB_BUILD_OPTION_PARALLEL = $(patsubst parallel=%,%,$(dpkg_buildopts_parallel)) endif endif # dpkg_buildopts_mk_included -- Dpkg.Org's dpkg
