admin/brew
1
0
Fork 0
Code Issues Packages Projects Releases 6 Wiki Activity

Enable HOMEBREW_PATCHELF_RB_WRITE for CI and HOMEBREW_DEV_CMD_RUN

Browse Source 
Enable HOMEBREW_PATCHELF_RB_WRITE by default for HOMEBREW_DEV_CMD_RUN
and CI, but not when building bottles.
This commit is contained in:
Shaun Jackman 2020-11-26 11:20:55 -08:00
parent 4bbf92912b
commit 8a4299d028
3 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Library/Homebrew/dev-cmd/bottle.rb
View File

@ -84,6 +84,8 @@ module Homebrew
end end
def bottle def bottle
ENV["HOMEBREW_NO_PATCHELF_RB_WRITE"] = "1" unless ENV["HOMEBREW_PATCHELF_RB_WRITE"].present?
args = bottle_args.parse args = bottle_args.parse
return merge(args: args) if args.merge? return merge(args: args) if args.merge?

2
Library/Homebrew/os/linux/elf.rb
View File

@ -101,7 +101,7 @@ module ELFShim
def patch!(interpreter: nil, rpath: nil) def patch!(interpreter: nil, rpath: nil)
return if interpreter.blank? && rpath.blank? return if interpreter.blank? && rpath.blank?
if HOMEBREW_PATCHELF_RB_WRITE if HOMEBREW_PATCHELF_RB_WRITE && ENV["HOMEBREW_NO_PATCHELF_RB_WRITE"].blank?
save_using_patchelf_rb interpreter, rpath save_using_patchelf_rb interpreter, rpath
else else
save_using_patchelf interpreter, rpath save_using_patchelf interpreter, rpath

2
Library/Homebrew/os/linux/global.rb
View File

@ -4,7 +4,7 @@
# Enables experimental `patchelf.rb` write support. # Enables experimental `patchelf.rb` write support.
HOMEBREW_PATCHELF_RB_WRITE = ( HOMEBREW_PATCHELF_RB_WRITE = (
ENV["HOMEBREW_NO_PATCHELF_RB_WRITE"].blank? && ENV["HOMEBREW_NO_PATCHELF_RB_WRITE"].blank? &&
(ENV["HOMEBREW_PATCHELF_RB_WRITE"].present? || ENV["CI"].blank?) (ENV["HOMEBREW_PATCHELF_RB_WRITE"].present? || ENV["CI"].present? || ENV["HOMEBREW_DEV_CMD_RUN"].present?)
).freeze ).freeze
module Homebrew module Homebrew