From 2ca03610e2b7d90d92c34a92b2e49bbee4f8d4ac Mon Sep 17 00:00:00 2001 From: rmnull Date: Tue, 14 Jul 2020 04:30:29 +0530 Subject: [PATCH 1/2] update patchelf.rb to '~> 1.1' in Gemfile. Replace instance variable access with call to .elf. patcher.elf was introduced in gem release v1.1.0. --- Library/Homebrew/Gemfile | 2 +- Library/Homebrew/os/linux/elf.rb | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Library/Homebrew/Gemfile b/Library/Homebrew/Gemfile index e6a4fdb19bc10..9e4809a99271f 100644 --- a/Library/Homebrew/Gemfile +++ b/Library/Homebrew/Gemfile @@ -23,7 +23,7 @@ end gem "activesupport" gem "concurrent-ruby" gem "mechanize" -gem "patchelf" if ENV["HOMEBREW_PATCHELF_RB"] +gem "patchelf", "~> 1.1" if ENV["HOMEBREW_PATCHELF_RB"] gem "plist" gem "rubocop-performance" gem "rubocop-rspec" diff --git a/Library/Homebrew/os/linux/elf.rb b/Library/Homebrew/os/linux/elf.rb index 51a12402075bc..2730d1da412bc 100644 --- a/Library/Homebrew/os/linux/elf.rb +++ b/Library/Homebrew/os/linux/elf.rb @@ -93,7 +93,7 @@ def dynamic_elf? return @dynamic_elf if defined? @dynamic_elf @dynamic_elf = if HOMEBREW_PATCHELF_RB - patchelf_patcher.instance_variable_get(:@elf).segment_by_type(:DYNAMIC).present? + patchelf_patcher.elf.segment_by_type(:DYNAMIC).present? elsif which "readelf" Utils.popen_read("readelf", "-l", to_path).include?(" DYNAMIC ") elsif which "file" From 0f9bdee8e90de0d0562dc182235a06611bf5a97e Mon Sep 17 00:00:00 2001 From: William Woodruff Date: Tue, 14 Jul 2020 14:35:55 -0400 Subject: [PATCH 2/2] Update Library/Homebrew/Gemfile Co-authored-by: Shaun Jackman --- Library/Homebrew/Gemfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Library/Homebrew/Gemfile b/Library/Homebrew/Gemfile index 9e4809a99271f..e6a4fdb19bc10 100644 --- a/Library/Homebrew/Gemfile +++ b/Library/Homebrew/Gemfile @@ -23,7 +23,7 @@ end gem "activesupport" gem "concurrent-ruby" gem "mechanize" -gem "patchelf", "~> 1.1" if ENV["HOMEBREW_PATCHELF_RB"] +gem "patchelf" if ENV["HOMEBREW_PATCHELF_RB"] gem "plist" gem "rubocop-performance" gem "rubocop-rspec"