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

Try to match unused symbol deps last

Browse Source
This commit is contained in:
Jack Nagel 2014-12-05 01:34:56 -05:00
parent 36b26c9bfc
commit 8f51541d41
1 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
Library/Homebrew/dependency_collector.rb
View File

@ -102,9 +102,6 @@ class DependencyCollector
def parse_symbol_spec(spec, tags) def parse_symbol_spec(spec, tags)
case spec case spec
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 :x11 then X11Dependency.new(spec.to_s, tags)
when :xcode then XcodeDependency.new(tags) when :xcode then XcodeDependency.new(tags)
when :macos then MinimumMacOSRequirement.new(tags) when :macos then MinimumMacOSRequirement.new(tags)
@ -115,22 +112,25 @@ class DependencyCollector
when :tex then TeXDependency.new(tags) when :tex then TeXDependency.new(tags)
when :arch then ArchRequirement.new(tags) when :arch then ArchRequirement.new(tags)
when :hg then MercurialDependency.new(tags) when :hg then MercurialDependency.new(tags)
# python2 is deprecated when :python then PythonDependency.new(tags)
when :python, :python2 then PythonDependency.new(tags)
when :python3 then Python3Dependency.new(tags) when :python3 then Python3Dependency.new(tags)
when :java then JavaDependency.new(tags) when :java then JavaDependency.new(tags)
when :osxfuse then OsxfuseDependency.new(tags) when :osxfuse then OsxfuseDependency.new(tags)
when :tuntap then TuntapDependency.new(tags) when :tuntap then TuntapDependency.new(tags)
when :ant then ant_dep(spec, tags)
when :apr then AprDependency.new(tags)
# Tiger's ld is too old to properly link some software # Tiger's ld is too old to properly link some software
when :ld64 then LD64Dependency.new if MacOS.version < :leopard when :ld64 then LD64Dependency.new if MacOS.version < :leopard
when :ant then ant_dep(spec, tags)
when :clt # deprecated when :clt # deprecated
when :apr then AprDependency.new(tags) when :autoconf, :automake, :bsdmake, :libtool # deprecated
autotools_dep(spec, tags)
when :cairo, :fontconfig, :freetype, :libpng, :pixman # deprecated when :cairo, :fontconfig, :freetype, :libpng, :pixman # deprecated
Dependency.new(spec.to_s, tags) Dependency.new(spec.to_s, tags)
when :libltdl # deprecated when :libltdl # deprecated
tags << :run tags << :run
Dependency.new("libtool", tags) Dependency.new("libtool", tags)
when :python2
PythonDependency.new(tags)
else else
raise ArgumentError, "Unsupported special dependency #{spec.inspect}" raise ArgumentError, "Unsupported special dependency #{spec.inspect}"
end end