From 97c76e2a9a1889dfe2b3f36162d00157b76916de Mon Sep 17 00:00:00 2001 From: Jack Nagel Date: Wed, 15 Feb 2012 09:59:23 -0600 Subject: libvpx: fix build on 64-bit Fixes #8163. Signed-off-by: Jack Nagel --- Library/Formula/libvpx.rb | 19 +++++++++++-------- 1 file changed, 11 insertions(+), 8 deletions(-) (limited to 'Library/Formula') diff --git a/Library/Formula/libvpx.rb b/Library/Formula/libvpx.rb index 44bd4378c..3fb619971 100644 --- a/Library/Formula/libvpx.rb +++ b/Library/Formula/libvpx.rb @@ -17,9 +17,6 @@ class Libvpx < Formula end def install - macbuild = Pathname.pwd+'macbuild' - mkdir macbuild - Dir.chdir macbuild args = ["--prefix=#{prefix}", "--enable-pic", "--enable-vp8"] @@ -27,10 +24,16 @@ class Libvpx < Formula args << "--enable-mem-tracker" if ARGV.include? "--mem-tracker" args << "--enable-postproc" if ARGV.include? "--postproc" args << "--enable-postproc-visualizer" if ARGV.include? "--visualizer" - # Configure detects 32-bit CPUs incorrectly. - args << "--target=generic-gnu" unless MacOS.prefer_64_bit? - system "../configure", *args - system "make" - system "make install" + + # Unless the arch is specified, configure tries to build universal. + # Patches welcome to detect and apply the real arch strings on each platform. + args << "--target=generic-gnu" + + mkdir 'macbuild' + cd 'macbuild' do + system "../configure", *args + system "make" + system "make install" + end end end -- cgit v1.2.3