From 83eab37a59da614fb743673f8907dc6942bd128a Mon Sep 17 00:00:00 2001 From: Christian Melki Date: Mon, 21 Nov 2022 22:30:06 +0100 Subject: host-ninja: Version bump. 1.10.2.g51db2.kitware.jobserver-1 -> 1.11.1.g95dee.kitware.jobserver-1 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 Message-Id: <20221121213006.2512310-1-christian.melki@t2data.com> Signed-off-by: Michael Olbrich --- .../0001-don-t-close-open-fds.patch | 30 ---------------------- .../ninja-1.10.2.g51db2.kitware.jobserver-1/series | 4 --- .../0001-don-t-close-open-fds.patch | 30 ++++++++++++++++++++++ .../ninja-1.11.1.g95dee.kitware.jobserver-1/series | 4 +++ rules/host-ninja.make | 4 +-- 5 files changed, 36 insertions(+), 36 deletions(-) delete mode 100644 patches/ninja-1.10.2.g51db2.kitware.jobserver-1/0001-don-t-close-open-fds.patch delete mode 100644 patches/ninja-1.10.2.g51db2.kitware.jobserver-1/series create mode 100644 patches/ninja-1.11.1.g95dee.kitware.jobserver-1/0001-don-t-close-open-fds.patch create mode 100644 patches/ninja-1.11.1.g95dee.kitware.jobserver-1/series diff --git a/patches/ninja-1.10.2.g51db2.kitware.jobserver-1/0001-don-t-close-open-fds.patch b/patches/ninja-1.10.2.g51db2.kitware.jobserver-1/0001-don-t-close-open-fds.patch deleted file mode 100644 index a2dfc5b8e..000000000 --- a/patches/ninja-1.10.2.g51db2.kitware.jobserver-1/0001-don-t-close-open-fds.patch +++ /dev/null @@ -1,30 +0,0 @@ -From: Michael Olbrich -Date: Mon, 29 Apr 2019 11:16:17 +0200 -Subject: [PATCH] don't close open fds - -PTXdist uses fd 9 to write debug information to the logfile. - -Signed-off-by: Michael Olbrich ---- - configure.py | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - -diff --git a/configure.py b/configure.py -index 57e1ca3ab369..e49802f4c75b 100755 ---- a/configure.py -+++ b/configure.py -@@ -191,7 +191,7 @@ class Bootstrap: - try: - if self.verbose: - print(cmdline) -- subprocess.check_call(cmdline, shell=True) -+ subprocess.check_call(cmdline, shell=True, close_fds=False) - except subprocess.CalledProcessError: - print('when running: ', cmdline) - raise -@@ -716,4 +716,4 @@ if options.bootstrap: - if options.verbose: - rebuild_args.append('-v') - -- subprocess.check_call(rebuild_args) -+ subprocess.check_call(rebuild_args, close_fds=False) diff --git a/patches/ninja-1.10.2.g51db2.kitware.jobserver-1/series b/patches/ninja-1.10.2.g51db2.kitware.jobserver-1/series deleted file mode 100644 index 05bd05b30..000000000 --- a/patches/ninja-1.10.2.g51db2.kitware.jobserver-1/series +++ /dev/null @@ -1,4 +0,0 @@ -# generated by git-ptx-patches -#tag:base --start-number 1 -0001-don-t-close-open-fds.patch -# 9f9c2c8544d68ab2c7db95cac6cf30bc - git-ptx-patches magic diff --git a/patches/ninja-1.11.1.g95dee.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 new file mode 100644 index 000000000..0155a62bb --- /dev/null +++ b/patches/ninja-1.11.1.g95dee.kitware.jobserver-1/0001-don-t-close-open-fds.patch @@ -0,0 +1,30 @@ +From: Michael Olbrich +Date: Mon, 29 Apr 2019 11:16:17 +0200 +Subject: [PATCH] don't close open fds + +PTXdist uses fd 9 to write debug information to the logfile. + +Signed-off-by: Michael Olbrich +--- + configure.py | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/configure.py b/configure.py +index a239b90eef44..1f287c116d66 100755 +--- a/configure.py ++++ b/configure.py +@@ -191,7 +191,7 @@ class Bootstrap: + try: + if self.verbose: + print(cmdline) +- subprocess.check_call(cmdline, shell=True) ++ subprocess.check_call(cmdline, shell=True, close_fds=False) + except subprocess.CalledProcessError: + print('when running: ', cmdline) + raise +@@ -722,4 +722,4 @@ if options.bootstrap: + if options.verbose: + rebuild_args.append('-v') + +- subprocess.check_call(rebuild_args) ++ subprocess.check_call(rebuild_args, close_fds=False) diff --git a/patches/ninja-1.11.1.g95dee.kitware.jobserver-1/series b/patches/ninja-1.11.1.g95dee.kitware.jobserver-1/series new file mode 100644 index 000000000..05bd05b30 --- /dev/null +++ b/patches/ninja-1.11.1.g95dee.kitware.jobserver-1/series @@ -0,0 +1,4 @@ +# generated by git-ptx-patches +#tag:base --start-number 1 +0001-don-t-close-open-fds.patch +# 9f9c2c8544d68ab2c7db95cac6cf30bc - git-ptx-patches magic diff --git a/rules/host-ninja.make b/rules/host-ninja.make index fab8fd2d3..f64230312 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) -- cgit v1.2.3