Skip to content

Commit d961605

Browse files
committed
Add jobserver support branch
Ninja has a PR for adding make jobserver support [1] that has been a widely debated PR for many... many years. Given that many people have forked to incorporate this PR, and it claims to solve a problem we have (OOM on gcc processes) it seems like it would be worthwhile using a well maintained fork instead of the main project. This is not a one way door. If we find that the project goes unmaintained, doesn't build, or otherwise has problems, we can always go back to using mainline. Of the forks that have pulled this in, there are: The Fuscia project [2] Their targets seem more specific and less generic, although their improvements seem more extensive. Kitware [3] Maintains a fork of ninja Docker [4] [1] ninja-build/ninja#1139 [2] https://fuchsia.googlesource.com/third_party/github.com/ninja-build/ninja/+/refs/heads/main/README.fuchsia [3] https://github.com/Kitware/ninja [4] https://github.com/dockbuild/ninja-jobserver ''' EXTRA_OEMESON_COMPILE:append = " \ --ninja-args='--tokenpool-master=fifo' \ " PARALLEL_MAKE = "-j 20" BB_NUMBER_THREADS = "20" ''' Signed-off-by: Ed Tanous <[email protected]>
1 parent 9e05d53 commit d961605

File tree

2 files changed

+4
-3
lines changed

2 files changed

+4
-3
lines changed

poky/meta/classes-recipe/meson.bbclass

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -171,7 +171,7 @@ do_configure[postfuncs] += "meson_do_qa_configure"
171171

172172
do_compile[progress] = "outof:^\[(\d+)/(\d+)\]\s+"
173173
meson_do_compile() {
174-
meson compile -v ${PARALLEL_MAKE} ${MESON_TARGET}
174+
meson compile -v ${PARALLEL_MAKE} ${EXTRA_OEMESON_COMPILE} ${MESON_TARGET}
175175
}
176176

177177
meson_do_install() {

poky/meta/recipes-devtools/ninja/ninja_1.11.1.bb

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,9 +6,10 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=a81586a64ad4e476c791cda7e2f2c52e"
66

77
DEPENDS = "re2c-native ninja-native"
88

9-
SRCREV = "a524bf3f6bacd1b4ad85d719eed2737d8562f27a"
9+
SRCREV = "c9e21dbbc4c746ba397c0f9bec5f65c99f783c08"
1010

11-
SRC_URI = "git://github.com/ninja-build/ninja.git;branch=release;protocol=https"
11+
# https://github.com/ninja-build/ninja/issues/1139
12+
SRC_URI = "git://github.com/ninja-build/ninja.git;branch=kitware-staged-features;protocol=https;nobranch=1"
1213
UPSTREAM_CHECK_GITTAGREGEX = "v(?P<pver>.*)"
1314

1415
S = "${WORKDIR}/git"

0 commit comments

Comments
 (0)