Allow explicitly requiring universal deps

Previously, instructing Homebrew that all dependencies should be built
universal could be accomplished by redefining BuildOptions#universal? in
the class body:

  def build.universal?
    true
  end

However, the build object is no longer shared by all specs, so this is
insufficient. Instead, a new DSL method, "require_universal_deps", can
be used.

This feature is almost exclusively for wine, which requires universal
deps but does not itself have a universal option, since it is always
built 32-bit.

1 files changed, 4 insertions, 0 deletions

diff --git a/Library/Homebrew/formula.rb b/Library/Homebrew/formula.rb
index 35dc9a08d..90ab6e66e 100644
--- a/Library/Homebrew/formula.rb
+++ b/Library/Homebrew/formula.rb
@@ -777,6 +777,10 @@ class Formula
       @cc_failures << CompilerFailure.new(compiler, &block)
     end
 
+    def require_universal_deps
+      specs.each { |spec| spec.build.universal = true }
+    end
+
     def test &block
       return @test unless block_given?
       @test_defined = true