diff options
| author | Johnathan Conley | 2014-08-29 14:05:12 -0500 |
|---|---|---|
| committer | Mike McQuaid | 2014-09-09 10:17:03 +0100 |
| commit | 0d154a991de4d8ba2d223c6cc77c67d983d95af2 (patch) | |
| tree | 4349928fe21e65f9b64709e647e5568df56e5465 | |
| parent | 6a3a3706034b3edfe99e0a37daef019e4a4ebff7 (diff) | |
| download | brew-0d154a991de4d8ba2d223c6cc77c67d983d95af2.tar.bz2 | |
Add :osxfuse dependency to support binary install.
add :osxfuse symbolic dependency
add ConflictsWithFuseForOsx requirement for osxfuse/fuse4x/fuse4x-kext
Closes Homebrew/homebrew#31975.
Signed-off-by: Mike McQuaid <mike@mikemcquaid.com>
| l--------- | Library/ENV/pkgconfig/fuse/fuse.pc | 1 | ||||
| l--------- | Library/ENV/pkgconfig/fuse/osxfuse.pc | 1 | ||||
| -rw-r--r-- | Library/Homebrew/dependency_collector.rb | 1 | ||||
| -rw-r--r-- | Library/Homebrew/requirements.rb | 1 | ||||
| -rw-r--r-- | Library/Homebrew/requirements/osxfuse_dependency.rb | 28 |
5 files changed, 32 insertions, 0 deletions
diff --git a/Library/ENV/pkgconfig/fuse/fuse.pc b/Library/ENV/pkgconfig/fuse/fuse.pc new file mode 120000 index 000000000..30b17c659 --- /dev/null +++ b/Library/ENV/pkgconfig/fuse/fuse.pc @@ -0,0 +1 @@ +/usr/local/lib/pkgconfig/fuse.pc
\ No newline at end of file diff --git a/Library/ENV/pkgconfig/fuse/osxfuse.pc b/Library/ENV/pkgconfig/fuse/osxfuse.pc new file mode 120000 index 000000000..153a5d6e2 --- /dev/null +++ b/Library/ENV/pkgconfig/fuse/osxfuse.pc @@ -0,0 +1 @@ +/usr/local/lib/pkgconfig/osxfuse.pc
\ No newline at end of file diff --git a/Library/Homebrew/dependency_collector.rb b/Library/Homebrew/dependency_collector.rb index dc75c884d..546e92af3 100644 --- a/Library/Homebrew/dependency_collector.rb +++ b/Library/Homebrew/dependency_collector.rb @@ -119,6 +119,7 @@ class DependencyCollector when :python, :python2 then PythonDependency.new(tags) when :python3 then Python3Dependency.new(tags) when :java then JavaDependency.new(tags) + when :osxfuse then OsxfuseDependency.new(tags) # Tiger's ld is too old to properly link some software when :ld64 then LD64Dependency.new if MacOS.version < :leopard when :ant then ant_dep(spec, tags) diff --git a/Library/Homebrew/requirements.rb b/Library/Homebrew/requirements.rb index 049e70d8d..add17b24e 100644 --- a/Library/Homebrew/requirements.rb +++ b/Library/Homebrew/requirements.rb @@ -3,6 +3,7 @@ require 'requirements/fortran_dependency' require 'requirements/language_module_dependency' require 'requirements/minimum_macos_requirement' require 'requirements/mpi_dependency' +require 'requirements/osxfuse_dependency' require 'requirements/python_dependency' require 'requirements/x11_dependency' diff --git a/Library/Homebrew/requirements/osxfuse_dependency.rb b/Library/Homebrew/requirements/osxfuse_dependency.rb new file mode 100644 index 000000000..b8f09c8f0 --- /dev/null +++ b/Library/Homebrew/requirements/osxfuse_dependency.rb @@ -0,0 +1,28 @@ +require "requirement" + +class OsxfuseDependency < Requirement + fatal true + default_formula "osxfuse" + satisfy { Formula["osxfuse"].installed? || self.class.binary_osxfuse_installed? } + + def self.binary_osxfuse_installed? + File.exist?("/usr/local/include/osxfuse/fuse.h") && !File.symlink?("/usr/local/include/osxfuse") + end + + env do + ENV.append_path "PKG_CONFIG_PATH", HOMEBREW_PREFIX/"Library/ENV/pkgconfig/fuse" + end + +end + +class ConflictsWithBinaryOsxfuse < Requirement + fatal true + satisfy { HOMEBREW_PREFIX.to_s != "/usr/local" || !OsxfuseDependency.binary_osxfuse_installed? } + + def message + <<-EOS.undent + osxfuse is already installed from the binary distribution and + conflicts with this formula. + EOS + end +end |
