Thanks, applied as 83eab37a59da614fb743673f8907dc6942bd128a. Michael
[sent from post-receive hook] On Wed, 23 Nov 2022 07:57:12 +0100, Christian Melki <[email protected]> wrote: > Move along the kitware ninjas. Fork of regular ninja but with jobserver > support. > Regular ninja release: > https://groups.google.com/g/ninja-build/c/R2oCyDctDf8/m/-U94Y5I8AgAJ > https://github.com/ninja-build/ninja/milestone/3?closed=1 > > * Reapplied patch set to make it apply cleanly. > > Signed-off-by: Christian Melki <[email protected]> > Message-Id: <[email protected]> > Signed-off-by: Michael Olbrich <[email protected]> > > diff --git > a/patches/ninja-1.10.2.g51db2.kitware.jobserver-1/0001-don-t-close-open-fds.patch > > b/patches/ninja-1.11.1.g95dee.kitware.jobserver-1/0001-don-t-close-open-fds.patch > similarity index 91% > rename from > patches/ninja-1.10.2.g51db2.kitware.jobserver-1/0001-don-t-close-open-fds.patch > rename to > patches/ninja-1.11.1.g95dee.kitware.jobserver-1/0001-don-t-close-open-fds.patch > index a2dfc5b8e91d..0155a62bb089 100644 > --- > a/patches/ninja-1.10.2.g51db2.kitware.jobserver-1/0001-don-t-close-open-fds.patch > +++ > b/patches/ninja-1.11.1.g95dee.kitware.jobserver-1/0001-don-t-close-open-fds.patch > @@ -10,7 +10,7 @@ Signed-off-by: Michael Olbrich <[email protected]> > 1 file changed, 2 insertions(+), 2 deletions(-) > > diff --git a/configure.py b/configure.py > -index 57e1ca3ab369..e49802f4c75b 100755 > +index a239b90eef44..1f287c116d66 100755 > --- a/configure.py > +++ b/configure.py > @@ -191,7 +191,7 @@ class Bootstrap: > @@ -22,7 +22,7 @@ index 57e1ca3ab369..e49802f4c75b 100755 > except subprocess.CalledProcessError: > print('when running: ', cmdline) > raise > -@@ -716,4 +716,4 @@ if options.bootstrap: > +@@ -722,4 +722,4 @@ if options.bootstrap: > if options.verbose: > rebuild_args.append('-v') > > diff --git a/patches/ninja-1.10.2.g51db2.kitware.jobserver-1/series > b/patches/ninja-1.11.1.g95dee.kitware.jobserver-1/series > similarity index 100% > rename from patches/ninja-1.10.2.g51db2.kitware.jobserver-1/series > rename to patches/ninja-1.11.1.g95dee.kitware.jobserver-1/series > diff --git a/rules/host-ninja.make b/rules/host-ninja.make > index fab8fd2d3ee2..f64230312f2c 100644 > --- a/rules/host-ninja.make > +++ b/rules/host-ninja.make > @@ -14,8 +14,8 @@ HOST_PACKAGES-$(PTXCONF_HOST_NINJA) += host-ninja > # > # Paths and names > # > -HOST_NINJA_VERSION := 1.10.2.g51db2.kitware.jobserver-1 > -HOST_NINJA_MD5 := 0bdd69f1013deb74465fe5d03e8fa2ea > +HOST_NINJA_VERSION := 1.11.1.g95dee.kitware.jobserver-1 > +HOST_NINJA_MD5 := 22de7254869309dc2c750933928b3500 > HOST_NINJA := ninja-$(HOST_NINJA_VERSION) > HOST_NINJA_SUFFIX := tar.gz > HOST_NINJA_URL := > https://github.com/Kitware/ninja/archive/refs/tags/v$(HOST_NINJA_VERSION).$(HOST_NINJA_SUFFIX)
