From 580eea89be1403485869f0fe52b1e52c185cb892 Mon Sep 17 00:00:00 2001 From: Jack Nagel Date: Mon, 10 Jun 2013 17:24:44 -0500 Subject: [PATCH] Cast deps to formula before passing them to superenv Dependency names retain the "tap prefix", e.g. the "homebrew/dupes" part of "homebrew/dupes/zlib". However formula objects do not, and this is desired because we do not record the tap name as part of the installation prefix. So we need to ensure the correct dep names are passed to superenv, otherwise it will not add the correct directories to various environment variables. --- Library/Homebrew/build.rb | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/Library/Homebrew/build.rb b/Library/Homebrew/build.rb index 96245f0223..461d711181 100755 --- a/Library/Homebrew/build.rb +++ b/Library/Homebrew/build.rb @@ -108,14 +108,14 @@ class Build pre_superenv_hacks require 'superenv' - deps.each do |dep| + deps.map(&:to_formula).each do |dep| opt = HOMEBREW_PREFIX/:opt/dep - fixopt(dep.to_formula) unless opt.directory? or ARGV.ignore_deps? + fixopt(dep) unless opt.directory? or ARGV.ignore_deps? end if superenv? ENV.keg_only_deps = keg_only_deps.map(&:to_s) - ENV.deps = deps.map(&:to_s) + ENV.deps = deps.map { |d| d.to_formula.to_s } ENV.x11 = reqs.any? { |rq| rq.kind_of?(X11Dependency) } ENV.setup_build_environment post_superenv_hacks