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

build: reorganize #install for readability

Browse Source
This commit is contained in:
Jack Nagel 2013-01-19 20:45:57 -06:00
parent 1f505af566
commit 3d92f1c683
1 changed files with 16 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
Library/Homebrew/build.rb
View File

@ -71,30 +71,14 @@ end
def install f def install f
deps = f.recursive_deps deps = f.recursive_deps
keg_only_deps = deps.select{|dep| dep.keg_only? } keg_only_deps = deps.select(&:keg_only?)
pre_superenv_hacks(f) pre_superenv_hacks(f)
require 'superenv' require 'superenv'
unless superenv?
ENV.setup_build_environment
# Requirements are processed first so that adjustments made to ENV
# for keg-only deps take precdence.
f.recursive_requirements.each { |rq| rq.modify_build_environment }
end
deps.each do |dep| deps.each do |dep|
opt = HOMEBREW_PREFIX/:opt/dep opt = HOMEBREW_PREFIX/:opt/dep
fixopt(dep) unless opt.directory? or ARGV.ignore_deps? fixopt(dep) unless opt.directory? or ARGV.ignore_deps?
if not superenv? and dep.keg_only?
ENV.prepend_path 'PATH', "#{opt}/bin"
ENV.prepend_path 'PKG_CONFIG_PATH', "#{opt}/lib/pkgconfig"
ENV.prepend_path 'PKG_CONFIG_PATH', "#{opt}/share/pkgconfig"
ENV.prepend_path 'ACLOCAL_PATH', "#{opt}/share/aclocal"
ENV.prepend_path 'CMAKE_PREFIX_PATH', opt
ENV.prepend 'LDFLAGS', "-L#{opt}/lib" if (opt/:lib).directory?
ENV.prepend 'CPPFLAGS', "-I#{opt}/include" if (opt/:include).directory?
end
end end
if superenv? if superenv?
@ -103,7 +87,21 @@ def install f
ENV.x11 = f.recursive_requirements.detect{|rq| rq.class == X11Dependency } ENV.x11 = f.recursive_requirements.detect{|rq| rq.class == X11Dependency }
ENV.setup_build_environment ENV.setup_build_environment
post_superenv_hacks(f) post_superenv_hacks(f)
f.recursive_requirements.each { |rq| rq.modify_build_environment } f.recursive_requirements.each(&:modify_build_environment)
else
ENV.setup_build_environment
f.recursive_requirements.each(&:modify_build_environment)
keg_only_deps.each do |dep|
opt = dep.opt_prefix
ENV.prepend_path 'PATH', "#{opt}/bin"
ENV.prepend_path 'PKG_CONFIG_PATH', "#{opt}/lib/pkgconfig"
ENV.prepend_path 'PKG_CONFIG_PATH', "#{opt}/share/pkgconfig"
ENV.prepend_path 'ACLOCAL_PATH', "#{opt}/share/aclocal"
ENV.prepend_path 'CMAKE_PREFIX_PATH', opt
ENV.prepend 'LDFLAGS', "-L#{opt}/lib" if (opt/:lib).directory?
ENV.prepend 'CPPFLAGS', "-I#{opt}/include" if (opt/:include).directory?
end
end end
if f.fails_with? ENV.compiler if f.fails_with? ENV.compiler