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

(PA-6900) Update ruby-augeas to 0.6.0 #905

Merged
merged 1 commit into from
Aug 28, 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
14 changes: 3 additions & 11 deletions configs/components/_base-ruby-augeas.rb
Original file line number Diff line number Diff line change
Expand Up @@ -3,20 +3,16 @@
# load it with instance_eval. See ruby-x.y-augeas.rb configs.
#

pkg.add_source("file://resources/patches/augeas/ruby-augeas-0.5.0-patch_c_extension.patch")
amitkarsale marked this conversation as resolved.
Show resolved Hide resolved

# We can remove the below patch after https://github.com/hercules-team/ruby-augeas/pull/17 is merged.
pkg.add_source("file://resources/patches/augeas/ruby-augeas-0.5.0-patch_remove_unused_parameter.patch")

# These can be overridden by the including component.
ruby_version ||= settings[:ruby_version]
host_ruby ||= settings[:host_ruby]
ruby_dir ||= settings[:ruby_dir]
ruby_bindir ||= settings[:ruby_bindir]

pkg.version "0.5.0"
pkg.md5sum "a132eace43ce13ccd059e22c0b1188ac"
pkg.url "http://download.augeas.net/ruby/ruby-augeas-#{pkg.get_version}.tgz"
pkg.version "0.6.0"
pkg.md5sum "3c2a13b748300b5a984bab9a30e74d0f"
pkg.url "https://github.com/hercules-team/ruby-augeas/releases/download/release-#{pkg.get_version}/ruby-augeas-#{pkg.get_version}.tgz"
pkg.mirror "#{settings[:buildsources_url]}/ruby-augeas-#{pkg.get_version}.tgz"

pkg.build_requires "ruby-#{ruby_version}"
Expand Down Expand Up @@ -75,10 +71,6 @@

pkg.build do
build_commands = []
if ruby_version =~ /^3/
build_commands << "#{platform.patch} --strip=2 --fuzz=0 --ignore-whitespace --no-backup-if-mismatch < ../ruby-augeas-0.5.0-patch_c_extension.patch"
end
build_commands << "#{platform.patch} --strip=2 --fuzz=0 --ignore-whitespace --no-backup-if-mismatch < ../ruby-augeas-0.5.0-patch_remove_unused_parameter.patch"
build_commands << "#{ruby} ext/augeas/extconf.rb"
build_commands << "#{platform[:make]} -e -j$(shell expr $(shell #{platform[:num_cores]}) + 1)"

Expand Down
12 changes: 0 additions & 12 deletions resources/patches/augeas/ruby-augeas-0.5.0-patch_c_extension.patch

This file was deleted.

This file was deleted.

Loading