From 53cf970312fb98d53fa5859bc039e453b60274cc Mon Sep 17 00:00:00 2001 From: Jack Nagel Date: Tue, 14 Aug 2012 21:45:08 -0500 Subject: [PATCH] build: expand requirements recursively when modifying ENV Signed-off-by: Jack Nagel --- Library/Homebrew/build.rb | 2 +- Library/Homebrew/formula.rb | 6 ++++++ 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/Library/Homebrew/build.rb b/Library/Homebrew/build.rb index 894c6b4e97..34c257dc84 100755 --- a/Library/Homebrew/build.rb +++ b/Library/Homebrew/build.rb @@ -56,7 +56,7 @@ at_exit do end def install f - f.requirements.each { |dep| dep.modify_build_environment } + f.recursive_requirements.each { |req| req.modify_build_environment } f.recursive_deps.uniq.each do |dep| dep = Formula.factory dep diff --git a/Library/Homebrew/formula.rb b/Library/Homebrew/formula.rb index 2f4562449e..bf7c4f3356 100644 --- a/Library/Homebrew/formula.rb +++ b/Library/Homebrew/formula.rb @@ -440,6 +440,12 @@ class Formula end end + def recursive_requirements + reqs = recursive_deps.map { |dep| dep.requirements }.to_set + reqs << requirements + reqs.flatten + end + protected # Pretty titles the command and buffers stdout/stderr