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-05-23 13:11:22 -05:00
parent 840a5c7418
commit 1e638331ad
1 changed files with 6 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
Library/Homebrew/dependency_collector.rb
View File

@ -98,14 +98,10 @@ class DependencyCollector
def parse_symbol_spec(spec, tags) def parse_symbol_spec(spec, tags)
case spec case spec
when :autoconf, :automake, :bsdmake, :libtool, :libltdl when :autoconf, :automake, :bsdmake, :libtool
# Xcode no longer provides autotools or some other build tools # Xcode no longer provides autotools or some other build tools
autotools_dep(spec, tags) autotools_dep(spec, tags)
when :x11 then X11Dependency.new(spec.to_s, 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 :xcode then XcodeDependency.new(tags)
when :macos then MinimumMacOSRequirement.new(tags) when :macos then MinimumMacOSRequirement.new(tags)
when :mysql then MysqlDependency.new(tags) when :mysql then MysqlDependency.new(tags)
@ -122,6 +118,11 @@ class DependencyCollector
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 :ant then ant_dep(spec, tags)
when :clt # deprecated 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 else
raise ArgumentError, "Unsupported special dependency #{spec.inspect}" raise ArgumentError, "Unsupported special dependency #{spec.inspect}"
end end
@ -136,11 +137,6 @@ class DependencyCollector
end end
def autotools_dep(spec, tags) def autotools_dep(spec, tags)
if spec == :libltdl
spec = :libtool
tags << :run
end
tags << :build unless tags.include? :run tags << :build unless tags.include? :run
Dependency.new(spec.to_s, tags) Dependency.new(spec.to_s, tags)
end end