Skip to content

Commit f545d2d

Browse files
committed
(PA-6900) Update ruby-augeas to 0.6.0
1 parent 38fc20b commit f545d2d

File tree

3 files changed

+3
-35
lines changed

3 files changed

+3
-35
lines changed

configs/components/_base-ruby-augeas.rb

Lines changed: 3 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -3,20 +3,16 @@
33
# load it with instance_eval. See ruby-x.y-augeas.rb configs.
44
#
55

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

117
# These can be overridden by the including component.
128
ruby_version ||= settings[:ruby_version]
139
host_ruby ||= settings[:host_ruby]
1410
ruby_dir ||= settings[:ruby_dir]
1511
ruby_bindir ||= settings[:ruby_bindir]
1612

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

2218
pkg.build_requires "ruby-#{ruby_version}"
@@ -75,10 +71,6 @@
7571

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

resources/patches/augeas/ruby-augeas-0.5.0-patch_c_extension.patch

Lines changed: 0 additions & 12 deletions
This file was deleted.

resources/patches/augeas/ruby-augeas-0.5.0-patch_remove_unused_parameter.patch

Lines changed: 0 additions & 12 deletions
This file was deleted.

0 commit comments

Comments
 (0)