From 294db3184906c4e1e6277830828c651d35a3b4b8 Mon Sep 17 00:00:00 2001 From: Shaun Jackman Date: Wed, 15 Aug 2018 10:21:42 -0700 Subject: [PATCH] BottleSpecification: Do not skip bottle relocation on Linux Bottles must be relocated on Linux to find the brewed glibc and gcc. --- Library/Homebrew/extend/os/linux/software_spec.rb | 5 +++++ Library/Homebrew/extend/os/software_spec.rb | 1 + Library/Homebrew/software_spec.rb | 2 ++ 3 files changed, 8 insertions(+) create mode 100644 Library/Homebrew/extend/os/linux/software_spec.rb create mode 100644 Library/Homebrew/extend/os/software_spec.rb diff --git a/Library/Homebrew/extend/os/linux/software_spec.rb b/Library/Homebrew/extend/os/linux/software_spec.rb new file mode 100644 index 0000000000..7e62ef9d8e --- /dev/null +++ b/Library/Homebrew/extend/os/linux/software_spec.rb @@ -0,0 +1,5 @@ +class BottleSpecification + def skip_relocation? + false + end +end diff --git a/Library/Homebrew/extend/os/software_spec.rb b/Library/Homebrew/extend/os/software_spec.rb new file mode 100644 index 0000000000..a3421738f1 --- /dev/null +++ b/Library/Homebrew/extend/os/software_spec.rb @@ -0,0 +1 @@ +require "extend/os/linux/software_spec" if OS.linux? diff --git a/Library/Homebrew/software_spec.rb b/Library/Homebrew/software_spec.rb index eedb10d283..a02af3bc00 100644 --- a/Library/Homebrew/software_spec.rb +++ b/Library/Homebrew/software_spec.rb @@ -407,3 +407,5 @@ class PourBottleCheck @formula.send(:define_method, :pour_bottle?, &block) end end + +require "extend/os/software_spec"