mirror of
https://github.com/chromebrew/chromebrew.git
synced 2026-01-09 15:37:56 -05:00
rebuild bison,sed, anagram, openjpeg, libjxl, gegl, gimp; update cpio, strace, putty, gpgme, tre, elinks, libgudev, upower, libdeflate, openexr, R, graphviz, gdal, imagemagick7, openblas, mold (#8920)
* rebuild bison,sed; update cpio * add strace * expand comment * add gpgme, putty * update tre * update elinks * deprecate js91 * rebuild anagram, update libgudev & upower * rebuild openjpeg * update libdeflate * update openexr * remove ilmbase deps (replaced by openexr) * deprecate ilmbase * rebuild gegl with newer openexr * update R * libjxl rebuild * graphviz => 9 * update gdal * imagemagick7 update * gimp rebuild * suggested changes * Add pre_ options to cmake and meson buildsystems * suggested changes * reversion gegl * update gdal url * redo versions * update py3_numpy * update openblas, mold * remove 'pre_' empty? checks in buildsystems * rebuild rust to fix binary issues on x86_64 * fixup missing rust completions
This commit is contained in:
committed by
GitHub
parent
511fa347ed
commit
d9ca5d8e1d
@@ -2,11 +2,11 @@ require 'fileutils'
|
||||
require 'package'
|
||||
|
||||
class Autotools < Package
|
||||
property :pre_configure_options, :configure_options
|
||||
property :configure_options, :pre_configure_options
|
||||
|
||||
def self.build
|
||||
unless File.file?('Makefile') && CREW_CACHE_BUILD
|
||||
puts "Additional configure_options being used: #{@pre_configure_options.nil? || @pre_configure_options.empty? ? '<no pre_configure_options>' : @pre_configure_options} #{@configure_options.nil? || @configure_options.empty? ? '<no configure_options>' : @configure_options}".orange
|
||||
puts "Additional configure_options being used: #{@pre_configure_options.nil? ? '<no pre_configure_options>' : @pre_configure_options} #{@configure_options.nil? ? '<no configure_options>' : @configure_options}".orange
|
||||
# Run autoreconf if necessary
|
||||
unless File.executable? './configure'
|
||||
if File.executable? './autogen.sh'
|
||||
|
||||
@@ -1,13 +1,13 @@
|
||||
require 'package'
|
||||
|
||||
class CMake < Package
|
||||
property :cmake_options
|
||||
property :cmake_options, :pre_cmake_options
|
||||
|
||||
def self.build
|
||||
puts "Additional cmake_options being used: #{@cmake_options.nil? || @cmake_options.empty? ? '<no cmake_options>' : @cmake_options}".orange
|
||||
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 "#{@mold_linker_prefix_cmd} cmake -B builddir -G Ninja #{@crew_cmake_options} #{@cmake_options}"
|
||||
system "#{@pre_cmake_options} #{@mold_linker_prefix_cmd} cmake -B builddir -G Ninja #{@crew_cmake_options} #{@cmake_options}"
|
||||
system "#{CREW_NINJA} -C builddir"
|
||||
end
|
||||
|
||||
|
||||
@@ -1,13 +1,13 @@
|
||||
require 'package'
|
||||
|
||||
class Meson < Package
|
||||
property :meson_options
|
||||
property :meson_options, :pre_meson_options
|
||||
|
||||
def self.build
|
||||
puts "Additional meson_options being used: #{@meson_options.nil? || @meson_options.empty? ? '<no meson_options>' : @meson_options}".orange
|
||||
puts "Additional meson_options being used: #{@pre_meson_options.nil? ? '<no pre_meson_options>' : @pre_meson_options} #{@meson_options.nil? ? '<no meson_options>' : @meson_options}".orange
|
||||
@crew_meson_options = @no_lto ? CREW_MESON_FNO_LTO_OPTIONS : CREW_MESON_OPTIONS
|
||||
@mold_linker_prefix_cmd = CREW_LINKER == 'mold' ? 'mold -run' : ''
|
||||
system "#{@mold_linker_prefix_cmd} meson setup #{@crew_meson_options} #{@meson_options} builddir"
|
||||
system "#{@pre_meson_options} #{@mold_linker_prefix_cmd} meson setup #{@crew_meson_options} #{@meson_options} builddir"
|
||||
system 'meson configure --no-pager builddir'
|
||||
system "#{CREW_NINJA} -C builddir"
|
||||
end
|
||||
|
||||
@@ -4,7 +4,7 @@ require 'json'
|
||||
require 'package'
|
||||
|
||||
class Pip < Package
|
||||
property :pip_install_extras
|
||||
property :pip_install_extras, :pre_configure_options
|
||||
|
||||
def self.install
|
||||
puts 'Checking for pip updates'.orange if @opt_verbose
|
||||
@@ -29,7 +29,8 @@ class Pip < Package
|
||||
end
|
||||
end
|
||||
puts "Installing #{@py_pkg} python module. This may take a while...".lightblue
|
||||
system "MAKEFLAGS=-j#{CREW_NPROC} python -s -m pip install -U #{@py_pkg} | grep -v 'Requirement already satisfied'", exception: false
|
||||
puts "Additional pre_configure_options being used: #{@pre_configure_options.nil? ? '<no pre_configure_options>' : @pre_configure_options}".orange
|
||||
system "MAKEFLAGS=-j#{CREW_NPROC} #{@pre_configure_options} python -s -m pip install -U #{@py_pkg} | grep -v 'Requirement already satisfied'", exception: false
|
||||
@pip_files = `python3 -s -m pip show -f #{@py_pkg}`.chomp
|
||||
@pip_files_base = @pip_files[/(?<=Location: ).*/, 0].concat('/')
|
||||
@pip_files_lines = @pip_files[/(?<=Files:\n)[\W|\w]*/, 0].split
|
||||
|
||||
Reference in New Issue
Block a user