mirror of
https://github.com/chromebrew/chromebrew.git
synced 2026-01-09 15:37:56 -05:00
Add libc version and chromeos milestone to container bash prompts (#10335)
* Use agree_to_remove in ruby_pry.rb. Signed-off-by: Satadru Pramanik <satadru@gmail.com> * Add cmake options for build_relative_dir Signed-off-by: Satadru Pramanik <satadru@gmail.com> * Adjust cmake buildsystems. Signed-off-by: Satadru Pramanik <satadru@gmail.com> * Alphabetize properties in buildsystems/python. Signed-off-by: Satadru Pramanik <satadru@gmail.com> * Add updated crew_profile_base. Signed-off-by: Satadru Pramanik <satadru@gmail.com> * Add missing filelists, add glibc fallback to gcc packages. Signed-off-by: Satadru Pramanik <satadru@gmail.com> * Add milestone to container git prompt. Signed-off-by: Satadru Pramanik <satadru@gmail.com> * Use more heredocs for the git commands. Signed-off-by: Satadru Pramanik <satadru@gmail.com> * Adjust git postinstall. Signed-off-by: Satadru Pramanik <satadru@gmail.com> * Add binaries. Signed-off-by: Satadru Pramanik <satadru@gmail.com> * Adjust unit test to do build test right after crew upgrade. Signed-off-by: Satadru Pramanik <satadru@gmail.com> * lint Signed-off-by: Satadru Pramanik <satadru@gmail.com> * Suggested changes. Signed-off-by: Satadru Pramanik <satadru@gmail.com> --------- Signed-off-by: Satadru Pramanik <satadru@gmail.com>
This commit is contained in:
committed by
GitHub
parent
e626eecde2
commit
66ca77930b
@@ -1,24 +1,31 @@
|
||||
require 'package'
|
||||
|
||||
class CMake < Package
|
||||
property :cmake_options, :pre_cmake_options, :cmake_build_extras, :cmake_install_extras
|
||||
property :cmake_build_extras, :cmake_build_relative_dir, :cmake_install_extras, :cmake_options, :pre_cmake_options
|
||||
|
||||
attr_accessor :cmake_build_relative_dir
|
||||
|
||||
def initialize
|
||||
super
|
||||
@cmake_build_relative_dir = '.'
|
||||
end
|
||||
|
||||
def self.build
|
||||
puts "Additional cmake_options being used: #{@pre_cmake_options.nil? ? '<no pre_cmake_options>' : @pre_cmake_options} #{@cmake_options.nil? ? '<no cmake_options>' : @cmake_options}".orange
|
||||
@crew_cmake_options = @no_lto ? CREW_CMAKE_FNO_LTO_OPTIONS : CREW_CMAKE_OPTIONS
|
||||
@mold_linker_prefix_cmd = CREW_LINKER == 'mold' ? 'mold -run' : ''
|
||||
system "#{@pre_cmake_options} #{@mold_linker_prefix_cmd} cmake -B builddir -G Ninja #{@crew_cmake_options} #{@cmake_options}"
|
||||
system "#{CREW_NINJA} -C builddir"
|
||||
system "#{@pre_cmake_options} #{@mold_linker_prefix_cmd} cmake -C #{@cmake_build_relative_dir} -B builddir -G Ninja #{@crew_cmake_options} #{@cmake_options}"
|
||||
system "#{CREW_NINJA} -C #{@cmake_build_relative_dir}/builddir"
|
||||
@cmake_build_extras&.call
|
||||
end
|
||||
|
||||
def self.install
|
||||
system "DESTDIR=#{CREW_DEST_DIR} #{CREW_NINJA} -C builddir install"
|
||||
system "DESTDIR=#{CREW_DEST_DIR} #{CREW_NINJA} -C #{@cmake_build_relative_dir}/builddir install"
|
||||
@cmake_install_extras&.call
|
||||
end
|
||||
|
||||
def self.check
|
||||
puts "Testing with #{CREW_NINJA} test.".orange if @run_tests
|
||||
system "#{CREW_NINJA} -C builddir test" if @run_tests
|
||||
system "#{CREW_NINJA} -C #{@cmake_build_relative_dir}/builddir test" if @run_tests
|
||||
end
|
||||
end
|
||||
|
||||
@@ -1,7 +1,7 @@
|
||||
require 'package'
|
||||
|
||||
class Python < Package
|
||||
property :python_build_options, :python_install_options, :python_build_extras, :python_install_extras, :no_svem
|
||||
property :no_svem, :python_build_extras, :python_build_options, :python_build_relative_dir, :python_install_extras, :python_install_options
|
||||
|
||||
attr_accessor :python_build_relative_dir
|
||||
|
||||
|
||||
Reference in New Issue
Block a user