Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Upgrade Abseil to 20240722.0 #162

Merged
merged 1 commit into from
Aug 1, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 1 addition & 4 deletions Rakefile
Original file line number Diff line number Diff line change
Expand Up @@ -16,9 +16,6 @@ re2_archive = File.join("ports/archives", File.basename(re2_recipe.files[0][:url

re2_gemspec.files << abseil_archive
re2_gemspec.files << re2_archive
Dir[File.join("patches/**/*.patch")].each do |patch|
re2_gemspec.files << patch
end

cross_platforms = %w[
aarch64-linux
Expand All @@ -42,7 +39,7 @@ Rake::ExtensionTask.new('re2', re2_gemspec) do |e|
e.config_options << '--disable-system-libraries'
e.cross_platform = cross_platforms
e.cross_compiling do |spec|
spec.files.reject! { |path| File.fnmatch?('ports/*', path) || File.fnmatch?('patches/*', path) }
spec.files.reject! { |path| File.fnmatch?('ports/*', path) }
spec.dependencies.reject! { |dep| dep.name == 'mini_portile2' }
end
end
Expand Down
4 changes: 2 additions & 2 deletions dependencies.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,5 +3,5 @@ libre2:
version: '2024-07-02'
sha256: eb2df807c781601c14a260a507a5bb4509be1ee626024cb45acbd57cb9d4032b
abseil:
version: '20240116.2'
sha256: 733726b8c3a6d39a4120d7e45ea8b41a434cdacde401cba500f14236c49b39dc
version: '20240722.0'
sha256: f50e5ac311a81382da7fa75b97310e4b9006474f9560ac46f54a9967f07d4ae3
1 change: 0 additions & 1 deletion ext/re2/recipes.rb
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,6 @@ def load_recipes
url: "https://github.com/abseil/abseil-cpp/archive/refs/tags/#{recipe.version}.tar.gz",
sha256: dependencies['abseil']['sha256']
}]
recipe.patch_files = Dir[File.join(PACKAGE_ROOT_DIR, "patches/abseil/*.patch")].sort
end

re2_recipe = build_recipe('libre2', dependencies['libre2']['version']) do |recipe|
Expand Down

This file was deleted.