aboutsummaryrefslogtreecommitdiffstats
path: root/Library/Homebrew/dependency_collector.rb
diff options
context:
space:
mode:
authorJack Nagel2014-05-23 13:11:22 -0500
committerJack Nagel2014-05-23 13:13:31 -0500
commit1e638331adfd92d8552449066d14e79f66f30bef (patch)
tree110f33760a293bef725480c6de94f5713e5cff34 /Library/Homebrew/dependency_collector.rb
parent840a5c74185ee44546008bd585c3e5edbfa9528c (diff)
downloadbrew-1e638331adfd92d8552449066d14e79f66f30bef.tar.bz2
Try to match unused symbol deps last
Diffstat (limited to 'Library/Homebrew/dependency_collector.rb')
-rw-r--r--Library/Homebrew/dependency_collector.rb16
1 files changed, 6 insertions, 10 deletions
diff --git a/Library/Homebrew/dependency_collector.rb b/Library/Homebrew/dependency_collector.rb
index c25989db3..295bad80c 100644
--- a/Library/Homebrew/dependency_collector.rb
+++ b/Library/Homebrew/dependency_collector.rb
@@ -98,14 +98,10 @@ class DependencyCollector
def parse_symbol_spec(spec, tags)
case spec
- when :autoconf, :automake, :bsdmake, :libtool, :libltdl
+ when :autoconf, :automake, :bsdmake, :libtool
# Xcode no longer provides autotools or some other build tools
autotools_dep(spec, tags)
when :x11 then X11Dependency.new(spec.to_s, tags)
- when :cairo, :fontconfig, :freetype, :libpng, :pixman
- # We no longer use X11 proxy deps, but we support the symbols
- # for backwards compatibility.
- Dependency.new(spec.to_s, tags)
when :xcode then XcodeDependency.new(tags)
when :macos then MinimumMacOSRequirement.new(tags)
when :mysql then MysqlDependency.new(tags)
@@ -122,6 +118,11 @@ class DependencyCollector
when :ld64 then LD64Dependency.new if MacOS.version < :leopard
when :ant then ant_dep(spec, tags)
when :clt # deprecated
+ when :cairo, :fontconfig, :freetype, :libpng, :pixman # deprecated
+ Dependency.new(spec.to_s, tags)
+ when :libltdl # deprecated
+ tags << :run
+ Dependency.new("libtool", tags)
else
raise ArgumentError, "Unsupported special dependency #{spec.inspect}"
end
@@ -136,11 +137,6 @@ class DependencyCollector
end
def autotools_dep(spec, tags)
- if spec == :libltdl
- spec = :libtool
- tags << :run
- end
-
tags << :build unless tags.include? :run
Dependency.new(spec.to_s, tags)
end