openwrt/tools/ninja/patches/010-bootstrap-configure-only.patch

--- a/configure.py
+++ b/configure.py
@@ -198,6 +198,8 @@ parser = OptionParser()
 profilers = ['gmon', 'pprof']
 parser.add_option('--bootstrap', action='store_true',
                   help='bootstrap a ninja binary from nothing')
+parser.add_option('--no-rebuild', action='store_true',
+                  help='let user execute ninja after build.ninja generation')
 parser.add_option('--verbose', action='store_true',
                   help='enable verbose build')
 parser.add_option('--platform',
@@ -756,7 +758,11 @@ n.build('all', 'phony', all_targets)
 n.close()
 print('wrote %s.' % BUILD_FILENAME)
 
-if options.bootstrap:
+if options.bootstrap and options.no_rebuild:
+    print('bootstrap complete. execute ninja in this directory...')
+    print(os.getcwd())
+
+elif options.bootstrap:
     print('bootstrap complete.  rebuilding...')
 
     rebuild_args = []
tools/ninja: use existing ninja to build ninja Add methods to skip the building and execution of Ninja by python in order to allow Make to execute Ninja after the configure script. This allows the user to build Ninja only once if they already have an older version of Ninja built. It also allows the user to test the jobserver functionality by having Ninja built twice (clean then compile). Signed-off-by: Michael Pratt <mcpratt@pm.me> Link: https://github.com/openwrt/openwrt/pull/16693 Signed-off-by: Robert Marko <robimarko@gmail.com> 2024-08-02 08:02:58 +00:00			`--- a/configure.py`
			`+++ b/configure.py`
tools/ninja: update to 1.12.1 Update to the most recent stable release, including a new job scheduler and bug fixes. Backport a patch to assist in reworking jobserver support. The original patch for jobserver support requires reworking due to the function CanRunMore() and its usage being significantly changed, including the return becoming an integer instead of a boolean. AcquireToken() must now be used in CanRunMore() in order to quantify how much the job searching loop is able to run at any time, and in order to do so CanRunMore() cannot be a constant function anymore. Added: - 010-backport-gtest.patch Manually Adjust: - 100-make_jobserver_support.patch Signed-off-by: Michael Pratt <mcpratt@pm.me> Link: https://github.com/openwrt/openwrt/pull/16693 Signed-off-by: Robert Marko <robimarko@gmail.com> 2024-10-12 18:55:04 +00:00			`@@ -198,6 +198,8 @@ parser = OptionParser()`
tools/ninja: use existing ninja to build ninja Add methods to skip the building and execution of Ninja by python in order to allow Make to execute Ninja after the configure script. This allows the user to build Ninja only once if they already have an older version of Ninja built. It also allows the user to test the jobserver functionality by having Ninja built twice (clean then compile). Signed-off-by: Michael Pratt <mcpratt@pm.me> Link: https://github.com/openwrt/openwrt/pull/16693 Signed-off-by: Robert Marko <robimarko@gmail.com> 2024-08-02 08:02:58 +00:00			`profilers = ['gmon', 'pprof']`
			`parser.add_option('--bootstrap', action='store_true',`
			`help='bootstrap a ninja binary from nothing')`
			`+parser.add_option('--no-rebuild', action='store_true',`
			`+ help='let user execute ninja after build.ninja generation')`
			`parser.add_option('--verbose', action='store_true',`
			`help='enable verbose build')`
			`parser.add_option('--platform',`
tools/ninja: update to 1.12.1 Update to the most recent stable release, including a new job scheduler and bug fixes. Backport a patch to assist in reworking jobserver support. The original patch for jobserver support requires reworking due to the function CanRunMore() and its usage being significantly changed, including the return becoming an integer instead of a boolean. AcquireToken() must now be used in CanRunMore() in order to quantify how much the job searching loop is able to run at any time, and in order to do so CanRunMore() cannot be a constant function anymore. Added: - 010-backport-gtest.patch Manually Adjust: - 100-make_jobserver_support.patch Signed-off-by: Michael Pratt <mcpratt@pm.me> Link: https://github.com/openwrt/openwrt/pull/16693 Signed-off-by: Robert Marko <robimarko@gmail.com> 2024-10-12 18:55:04 +00:00			`@@ -756,7 +758,11 @@ n.build('all', 'phony', all_targets)`
tools/ninja: use existing ninja to build ninja Add methods to skip the building and execution of Ninja by python in order to allow Make to execute Ninja after the configure script. This allows the user to build Ninja only once if they already have an older version of Ninja built. It also allows the user to test the jobserver functionality by having Ninja built twice (clean then compile). Signed-off-by: Michael Pratt <mcpratt@pm.me> Link: https://github.com/openwrt/openwrt/pull/16693 Signed-off-by: Robert Marko <robimarko@gmail.com> 2024-08-02 08:02:58 +00:00			`n.close()`
			`print('wrote %s.' % BUILD_FILENAME)`

			`-if options.bootstrap:`
			`+if options.bootstrap and options.no_rebuild:`
			`+ print('bootstrap complete. execute ninja in this directory...')`
			`+ print(os.getcwd())`
			`+`
			`+elif options.bootstrap:`
			`print('bootstrap complete. rebuilding...')`

			`rebuild_args = []`