From 07c2d2db6113d64b8120eed35cc28029c31c5b42 Mon Sep 17 00:00:00 2001
From: Adam Vandenberg
Date: Mon, 23 Jul 2012 12:17:54 -0700
Subject: jpeg-turbo: explicitly choose our nasm

64-bit builds won't work with the Xcode-provided nasm.
Explicitly select Homebrew's nasm in this case, so the user's
PATH won't cause the system version to be selected.
---
 Library/Formula/jpeg-turbo.rb | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

(limited to 'Library/Formula')

diff --git a/Library/Formula/jpeg-turbo.rb b/Library/Formula/jpeg-turbo.rb
index 4c0e32031..44c0cb1d6 100644
--- a/Library/Formula/jpeg-turbo.rb
+++ b/Library/Formula/jpeg-turbo.rb
@@ -11,7 +11,12 @@ class JpegTurbo < Formula
 
   def install
     args = ["--disable-dependency-tracking", "--prefix=#{prefix}"]
-    args << "--host=x86_64-apple-darwin" if MacOS.prefer_64_bit?
+    if MacOS.prefer_64_bit?
+      args << "--host=x86_64-apple-darwin"
+      # Auto-detect our 64-bit nasm
+      args << "NASM=#{Formula.factory('nasm').bin}/nasm"
+    end
+
     system "./configure", *args
     system 'make'
     ENV.j1 # Stops a race condition error: file exists
-- 
cgit v1.2.3