github/chromebrew
1
1
Fork 0
mirror of https://github.com/chromebrew/chromebrew.git synced 2026-01-08 23:18:10 -05:00
Code Issues Packages Projects Releases Wiki Activity

Update ninja to 1.13.0 and enable new jobserver functionality when using ninja. (#12123)

Browse Source 
Signed-off-by: Satadru Pramanik <satadru@gmail.com>
This commit is contained in:
Satadru Pramanik, DO, MPH, MEng
2025-06-30 15:46:41 -04:00
committed by GitHub
parent ed857be7a7
commit 878abfb4e2
6 changed files with 17 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
lib/buildsystems/cmake.rb
View File

@@ -13,7 +13,7 @@ class CMake < Package
print_buildsystem_methods
system "#{@pre_cmake_options} cmake -S #{@cmake_build_relative_dir} -B #{@cmake_build_relative_dir}/builddir -G Ninja #{@crew_cmake_options} #{@cmake_options}"
system "#{CREW_NINJA} -C #{@cmake_build_relative_dir}/builddir"
system "#{CREW_PREFIX}/bin/jobserver_pool.py -j #{CREW_NPROC} #{CREW_NINJA} -C #{@cmake_build_relative_dir}/builddir"
@cmake_build_extras&.call
end
@@ -24,6 +24,6 @@ class CMake < Package
def self.check
puts "Testing with #{CREW_NINJA} test.".orange if @run_tests
system "ctest -j --progress --test-dir #{@cmake_build_relative_dir}/builddir --rerun-failed --output-on-failure" if @run_tests
system "#{CREW_PREFIX}/bin/jobserver_pool.py -j #{CREW_NPROC} ctest -j --progress --test-dir #{@cmake_build_relative_dir}/builddir --rerun-failed --output-on-failure" if @run_tests
end
end

2
lib/buildsystems/meson.rb
View File

@@ -14,7 +14,7 @@ class Meson < Package
system "#{@pre_meson_options} meson setup #{@crew_meson_options} #{@meson_options} #{@meson_build_relative_dir}/builddir #{@meson_build_relative_dir}"
system "meson configure --no-pager #{@meson_build_relative_dir}/builddir"
system "#{CREW_NINJA} -C #{@meson_build_relative_dir}/builddir"
system "#{CREW_PREFIX}/bin/jobserver_pool.py -j #{CREW_NPROC} #{CREW_NINJA} -C #{@meson_build_relative_dir}/builddir"
@meson_build_extras&.call
end