From c5d56bc501664b5a159b60e86672fcdda5c19d27 Mon Sep 17 00:00:00 2001
From: Adam Vandenberg
Date: Wed, 16 Jun 2010 11:50:36 -0700
Subject: Add "fails_with_llvm" to formula to document LLVM build breaks.

Replaced ENV.gcc_4_2 + comments with calls to "fails_with_llvm",
to specifically message to the user when a formula is known or suspected
to not build with LLVM. If the user specifies "--use-llvm", the message
will be displayed, but compilation will be tried anyway.

Since using LLVM is now an advanced/hidden feature instead of the
default on 10.6, we'll let the user try anyway (and submit patches
if things are now working.)
---
 Library/Formula/aqbanking.rb               | 3 +--
 Library/Formula/aria2.rb                   | 2 +-
 Library/Formula/aspell.rb                  | 2 +-
 Library/Formula/bdw-gc.rb                  | 5 ++---
 Library/Formula/boost.rb                   | 5 ++---
 Library/Formula/celt.rb                    | 4 +---
 Library/Formula/dirac.rb                   | 3 +--
 Library/Formula/elinks.rb                  | 2 +-
 Library/Formula/erlang.rb                  | 2 +-
 Library/Formula/flusspferd.rb              | 2 +-
 Library/Formula/gambit-scheme.rb           | 4 +---
 Library/Formula/gmp.rb                     | 3 +--
 Library/Formula/gnu-smalltalk.rb           | 3 +--
 Library/Formula/gpgme.rb                   | 2 +-
 Library/Formula/graphicsmagick.rb          | 2 +-
 Library/Formula/gwenhywfar.rb              | 3 +--
 Library/Formula/john.rb                    | 2 +-
 Library/Formula/libexif.rb                 | 4 +---
 Library/Formula/monotone.rb                | 4 +---
 Library/Formula/mysql-connector-c.rb       | 2 +-
 Library/Formula/mysql.rb                   | 2 +-
 Library/Formula/ncursesw.rb                | 2 +-
 Library/Formula/nethack.rb                 | 2 +-
 Library/Formula/nmap.rb                    | 2 +-
 Library/Formula/node.rb                    | 2 +-
 Library/Formula/pbzip2.rb                  | 3 +--
 Library/Formula/pdflib-lite.rb             | 3 +--
 Library/Formula/portaudio.rb               | 2 +-
 Library/Formula/povray.rb                  | 3 +--
 Library/Formula/proj.rb                    | 2 +-
 Library/Formula/protobuf.rb                | 2 +-
 Library/Formula/pv.rb                      | 5 ++---
 Library/Formula/redis.rb                   | 2 +-
 Library/Formula/redland.rb                 | 3 +--
 Library/Formula/ruby-enterprise-edition.rb | 2 +-
 Library/Formula/ruby.rb                    | 2 +-
 Library/Formula/sdl.rb                     | 2 +-
 Library/Formula/sphinx.rb                  | 4 +---
 Library/Formula/spin.rb                    | 2 +-
 Library/Formula/streamripper.rb            | 2 +-
 Library/Formula/syck.rb                    | 2 +-
 Library/Formula/tesseract.rb               | 3 +--
 Library/Formula/tex-live.rb                | 3 +--
 Library/Formula/unittest.rb                | 2 +-
 Library/Formula/vice.rb                    | 3 +--
 Library/Formula/visualboyadvance.rb        | 2 +-
 Library/Formula/vpnc.rb                    | 2 +-
 Library/Formula/w3m.rb                     | 2 +-
 Library/Formula/wine.rb                    | 3 +--
 49 files changed, 52 insertions(+), 78 deletions(-)

(limited to 'Library/Formula')

diff --git a/Library/Formula/aqbanking.rb b/Library/Formula/aqbanking.rb
index 617b21454..d04b64a85 100644
--- a/Library/Formula/aqbanking.rb
+++ b/Library/Formula/aqbanking.rb
@@ -12,8 +12,7 @@ class Aqbanking <Formula
  #depends_on 'qt3' # for gui frontends
 
   def install
-    # llvm results in a sigsegfault during compile
-    ENV.gcc_4_2
+    fails_with_llvm "llvm results in a sigsegfault during compile"
     configure_args = [
         "--prefix=#{prefix}",
         "--disable-debug",
diff --git a/Library/Formula/aria2.rb b/Library/Formula/aria2.rb
index 31a0772a0..f1227c368 100644
--- a/Library/Formula/aria2.rb
+++ b/Library/Formula/aria2.rb
@@ -6,7 +6,7 @@ class Aria2 <Formula
   homepage 'http://aria2.sourceforge.net/'
 
   def install
-    ENV.gcc_4_2 # 1.8.2 didn't work w/ LLVM
+    fails_with_llvm "1.8.2 didn't work w/ LLVM"
     system "./configure", "--disable-dependency-tracking",
                           "--prefix=#{prefix}"
     system "make install"
diff --git a/Library/Formula/aspell.rb b/Library/Formula/aspell.rb
index 7013211f2..1177c3e38 100644
--- a/Library/Formula/aspell.rb
+++ b/Library/Formula/aspell.rb
@@ -358,7 +358,7 @@ class Aspell <Formula
   end
 
   def install
-    ENV.gcc_4_2
+    fails_with_llvm
     system "./configure", "--prefix=#{prefix}"
     system "make install"
 
diff --git a/Library/Formula/bdw-gc.rb b/Library/Formula/bdw-gc.rb
index cbb8a11f1..95323082c 100644
--- a/Library/Formula/bdw-gc.rb
+++ b/Library/Formula/bdw-gc.rb
@@ -6,10 +6,9 @@ class BdwGc <Formula
   md5 '2ff9924c7249ef7f736ecfe6f08f3f9b'
 
   def install
+    fails_with_llvm "LLVM gives an unsupported inline asm error"
+
     if MACOS_VERSION == 10.6
-      # LLVM gives an unsupported inline asm error
-      ENV.gcc_4_2
-      
       # ucontext has been deprecated in 10.6
       # use this flag to force the header to compile
       ENV.append 'CPPFLAGS', "-D_XOPEN_SOURCE"
diff --git a/Library/Formula/boost.rb b/Library/Formula/boost.rb
index 2257c21c8..d1190fc5e 100644
--- a/Library/Formula/boost.rb
+++ b/Library/Formula/boost.rb
@@ -10,9 +10,8 @@ class Boost <Formula
   end
 
   def install
-    # Use GCC 4.2 because the standard llvm-gcc causes errors with dropped arugments
-    # to functions when linking with the boost library
-    ENV.gcc_4_2
+    fails_with_llvm "the standard llvm-gcc causes errors with dropped arugments "+
+                    "to functions when linking with the boost library"
 
     # Not sure about this, but added since macports has it
     mkdir 'libs/random/build'
diff --git a/Library/Formula/celt.rb b/Library/Formula/celt.rb
index f69969765..e3a4ea0fa 100644
--- a/Library/Formula/celt.rb
+++ b/Library/Formula/celt.rb
@@ -8,9 +8,7 @@ class Celt <Formula
   depends_on 'libogg' => :optional
 
   def install
-    # 1 Test failed with llvm-gcc
-    ENV.gcc_4_2
-
+    fails_with_llvm "1 test failed with llvm-gcc"
     system "./configure", "--prefix=#{prefix}", "--disable-debug", "--disable-dependency-tracking", "--enable-new-plc"
     system "make check"
     system "make install"
diff --git a/Library/Formula/dirac.rb b/Library/Formula/dirac.rb
index 4f778f557..02ed09e59 100644
--- a/Library/Formula/dirac.rb
+++ b/Library/Formula/dirac.rb
@@ -6,8 +6,7 @@ class Dirac <Formula
   homepage 'http://diracvideo.org/'
 
   def install
-    ENV.gcc_4_2
-
+    fails_with_llvm
     system "./configure", "--prefix=#{prefix}", "--disable-debug", "--disable-dependency-tracking"
     system "make install"
   end
diff --git a/Library/Formula/elinks.rb b/Library/Formula/elinks.rb
index a6367b575..07fac973c 100644
--- a/Library/Formula/elinks.rb
+++ b/Library/Formula/elinks.rb
@@ -7,7 +7,7 @@ class Elinks <Formula
 
   def install
     ENV.deparallelize
-    ENV.gcc_4_2
+    fails_with_llvm
     ENV.delete('LD')
     system "./configure --prefix='#{prefix}'"
     system "make install"
diff --git a/Library/Formula/erlang.rb b/Library/Formula/erlang.rb
index d8a2d0b33..3acef5602 100644
--- a/Library/Formula/erlang.rb
+++ b/Library/Formula/erlang.rb
@@ -25,7 +25,7 @@ class Erlang <Formula
 
   def install
     ENV.deparallelize
-    ENV.gcc_4_2 # see http://github.com/mxcl/homebrew/issues/#issue/120
+    fails_with_llvm "see http://github.com/mxcl/homebrew/issues/#issue/120"
 
     # If building from GitHub, this step is required (but not for tarball downloads.)
     system "./otp_build autoconf" if File.exist? "otp_build"
diff --git a/Library/Formula/flusspferd.rb b/Library/Formula/flusspferd.rb
index 9ce5bfb0f..fa20c1258 100644
--- a/Library/Formula/flusspferd.rb
+++ b/Library/Formula/flusspferd.rb
@@ -12,7 +12,7 @@ class Flusspferd <Formula
   depends_on 'spidermonkey'
 
   def install
-    ENV.gcc_4_2
+    fails_with_llvm
     system "cmake -H. -Bbuild #{std_cmake_parameters}"
     system "make install"
   end
diff --git a/Library/Formula/gambit-scheme.rb b/Library/Formula/gambit-scheme.rb
index 2130f3b55..a4040ca74 100644
--- a/Library/Formula/gambit-scheme.rb
+++ b/Library/Formula/gambit-scheme.rb
@@ -13,9 +13,7 @@ class GambitScheme <Formula
   end
 
   def install
-    # Gambit Scheme currently fails to build with llvm-gcc
-    # (ld crashes during the build process)
-    ENV.gcc_4_2
+    fails_with_llvm "ld crashes during the build process"
     # Gambit Scheme doesn't like full optimizations
     ENV.O2
 
diff --git a/Library/Formula/gmp.rb b/Library/Formula/gmp.rb
index f966100c4..3d765ac01 100644
--- a/Library/Formula/gmp.rb
+++ b/Library/Formula/gmp.rb
@@ -13,8 +13,7 @@ class Gmp <Formula
   end
 
   def install
-    # On OS X 10.6, some tests fail under LLVM
-    ENV.gcc_4_2
+    fails_with_llvm "On OS X 10.6, some tests fail under LLVM"
 
     args = ["--prefix=#{prefix}", "--infodir=#{info}", "--enable-cxx"]
 
diff --git a/Library/Formula/gnu-smalltalk.rb b/Library/Formula/gnu-smalltalk.rb
index 818eb8004..1a24408fc 100644
--- a/Library/Formula/gnu-smalltalk.rb
+++ b/Library/Formula/gnu-smalltalk.rb
@@ -17,8 +17,7 @@ class GnuSmalltalk <Formula
   # depends_on 'gmp' => :optional # 32/64 built build problems
 
   def install
-    # Codegen problems with LLVM
-    ENV.gcc_4_2
+    fails_with_llvm "Codegen problems with LLVM"
 
     # 64-bit version doesn't build, so force 32 bits.
     ENV.m32
diff --git a/Library/Formula/gpgme.rb b/Library/Formula/gpgme.rb
index a653f91ea..562edf2a6 100644
--- a/Library/Formula/gpgme.rb
+++ b/Library/Formula/gpgme.rb
@@ -9,7 +9,7 @@ class Gpgme < Formula
   depends_on 'libgpg-error'
 
   def install
-    ENV.gcc_4_2
+    fails_with_llvm
     system "./configure", "--disable-debug", "--disable-dependency-tracking",
                           "--prefix=#{prefix}",
                           "--disable-asm"
diff --git a/Library/Formula/graphicsmagick.rb b/Library/Formula/graphicsmagick.rb
index a3bf3d66b..f81ed5162 100644
--- a/Library/Formula/graphicsmagick.rb
+++ b/Library/Formula/graphicsmagick.rb
@@ -34,7 +34,7 @@ class Graphicsmagick <Formula
   end
 
   def install
-    ENV.gcc_4_2
+    fails_with_llvm
     ENV.libpng
     ENV.O3
 
diff --git a/Library/Formula/gwenhywfar.rb b/Library/Formula/gwenhywfar.rb
index 751d83fae..b558d9483 100644
--- a/Library/Formula/gwenhywfar.rb
+++ b/Library/Formula/gwenhywfar.rb
@@ -11,8 +11,7 @@ class Gwenhywfar <Formula
 
   
   def install
-    # llvm results in a sigsegfault during compile
-    ENV.gcc_4_2
+    fails_with_llvm "llvm results in a sigsegfault during compile"
     system "./configure", "--prefix=#{prefix}", "--disable-debug", "--disable-dependency-tracking"
     system "make install"
   end
diff --git a/Library/Formula/john.rb b/Library/Formula/john.rb
index 1e1198381..e5d797605 100644
--- a/Library/Formula/john.rb
+++ b/Library/Formula/john.rb
@@ -11,7 +11,7 @@ class John <Formula
   
   def install
     ENV.deparallelize
-    ENV.gcc_4_2
+    fails_with_llvm
     arch = Hardware.is_64_bit? ? '64' : 'sse2'
     
     Dir.chdir 'src' do
diff --git a/Library/Formula/libexif.rb b/Library/Formula/libexif.rb
index 49453b140..9d26709e0 100644
--- a/Library/Formula/libexif.rb
+++ b/Library/Formula/libexif.rb
@@ -6,9 +6,7 @@ class Libexif <Formula
   md5 '56144a030a4c875c600b1ccf713f69f7'
 
   def install
-    # segfault with llvm
-    ENV.gcc_4_2
-    
+    fails_with_llvm "segfault with llvm"
     system "./configure", "--prefix=#{prefix}", "--disable-dependency-tracking"
     system "make install"
   end
diff --git a/Library/Formula/monotone.rb b/Library/Formula/monotone.rb
index e9be98a07..2dbc88675 100644
--- a/Library/Formula/monotone.rb
+++ b/Library/Formula/monotone.rb
@@ -14,9 +14,7 @@ class Monotone <Formula
   depends_on 'pcre'
 
   def install
-    # linker fails
-    ENV.gcc_4_2
-
+    fails_with_llvm "linker fails"
     system "./configure", "--prefix=#{prefix}", "--disable-debug", "--disable-dependency-tracking"
     system "make install"
   end
diff --git a/Library/Formula/mysql-connector-c.rb b/Library/Formula/mysql-connector-c.rb
index 962480029..3c8d69ffc 100644
--- a/Library/Formula/mysql-connector-c.rb
+++ b/Library/Formula/mysql-connector-c.rb
@@ -8,7 +8,7 @@ class MysqlConnectorC <Formula
   depends_on 'cmake'
 
   def install
-    ENV.gcc_4_2 # error: unsupported inline asm
+    fails_with_llvm "error: unsupported inline asm"
     system "cmake . #{std_cmake_parameters}"
     system 'make'
     ENV.j1
diff --git a/Library/Formula/mysql.rb b/Library/Formula/mysql.rb
index bd708bbe2..032afe9ca 100644
--- a/Library/Formula/mysql.rb
+++ b/Library/Formula/mysql.rb
@@ -20,7 +20,7 @@ class Mysql <Formula
   end
 
   def install
-    ENV.gcc_4_2 # http://github.com/mxcl/homebrew/issues/#issue/144
+    fails_with_llvm "http://github.com/mxcl/homebrew/issues/issue/144"
 
     # See: http://dev.mysql.com/doc/refman/5.1/en/configure-options.html
     # These flags may not apply to gcc 4+
diff --git a/Library/Formula/ncursesw.rb b/Library/Formula/ncursesw.rb
index aa34e75c7..9894a39c8 100644
--- a/Library/Formula/ncursesw.rb
+++ b/Library/Formula/ncursesw.rb
@@ -6,7 +6,7 @@ class Ncursesw <Formula
   homepage 'http://www.gnu.org/software/ncurses/ncurses.html'
 
   def install
-    ENV.gcc_4_2
+    fails_with_llvm
     system "./configure", "--prefix=#{prefix}",
                           "--mandir=#{man}",
                           "--disable-debug",
diff --git a/Library/Formula/nethack.rb b/Library/Formula/nethack.rb
index c66fef079..06a86a8c0 100644
--- a/Library/Formula/nethack.rb
+++ b/Library/Formula/nethack.rb
@@ -26,7 +26,7 @@ class Nethack <Formula
   end
 
   def install
-    ENV.gcc_4_2
+    fails_with_llvm
     # Build everything in-order; no multi builds.
     ENV.deparallelize
 
diff --git a/Library/Formula/nmap.rb b/Library/Formula/nmap.rb
index 77533da83..e220a4edc 100644
--- a/Library/Formula/nmap.rb
+++ b/Library/Formula/nmap.rb
@@ -6,7 +6,7 @@ class Nmap <Formula
   @md5='f77fa51d89ab27d35e5cd87bb086b858'
 
   def install
-    ENV.gcc_4_2
+    fails_with_llvm
     ENV.deparallelize
     system "./configure", "--prefix=#{prefix}", 
                           "--without-zenmap"
diff --git a/Library/Formula/node.rb b/Library/Formula/node.rb
index 2af959796..6462fd62d 100644
--- a/Library/Formula/node.rb
+++ b/Library/Formula/node.rb
@@ -15,7 +15,7 @@ class Node <Formula
   end
 
   def install
-    ENV.gcc_4_2
+    fails_with_llvm
     inreplace %w{wscript configure} do |s|
       s.gsub! '/usr/local', HOMEBREW_PREFIX
       s.gsub! '/opt/local/lib', '/usr/lib'
diff --git a/Library/Formula/pbzip2.rb b/Library/Formula/pbzip2.rb
index 8eb505649..331d49266 100644
--- a/Library/Formula/pbzip2.rb
+++ b/Library/Formula/pbzip2.rb
@@ -6,8 +6,7 @@ class Pbzip2 <Formula
   md5 'b354422759da7113da366aad1876ed5d'
 
   def install
-    # Won't compile with LLVM
-    ENV.gcc_4_2
+    fails_with_llvm
     
     inreplace "Makefile" do |s|
       s.change_make_var! 'PREFIX', prefix
diff --git a/Library/Formula/pdflib-lite.rb b/Library/Formula/pdflib-lite.rb
index 46549fd5e..e3e4e95f4 100644
--- a/Library/Formula/pdflib-lite.rb
+++ b/Library/Formula/pdflib-lite.rb
@@ -7,8 +7,7 @@ class PdflibLite <Formula
   version "7.0.4p4"
 
   def install
-    # SL 10.6.1 LLVM crashes with an internal compiler error on this version.
-    ENV.gcc_4_2
+    fails_with_llvm "SL 10.6.1 LLVM crashes with an internal compiler error on this version."
 
     # Without the following substituion, pdflib-lite runs into weird
     # build errors due to bad interactions with the TIFF headers.
diff --git a/Library/Formula/portaudio.rb b/Library/Formula/portaudio.rb
index fb633b04d..b140efdbc 100644
--- a/Library/Formula/portaudio.rb
+++ b/Library/Formula/portaudio.rb
@@ -6,7 +6,7 @@ class Portaudio <Formula
   md5 'd2943e4469834b25afe62cc51adc025f'
 
   def install
-    ENV.gcc_4_2
+    fails_with_llvm
 
     system "./configure", "--prefix=#{prefix}", "--disable-debug", "--disable-dependency-tracking"
 
diff --git a/Library/Formula/povray.rb b/Library/Formula/povray.rb
index ae9fd82be..99da5852b 100644
--- a/Library/Formula/povray.rb
+++ b/Library/Formula/povray.rb
@@ -6,8 +6,7 @@ class Povray <Formula
   md5 'b5789bb7eeaed0809c5c82d0efda571d'
 
   def install
-    # llvm-gcc: povray fails with 'terminate called after throwing an instance of int'
-    ENV.gcc_4_2
+    fails_with_llvm "llvm-gcc: povray fails with 'terminate called after throwing an instance of int'"
 
     system "./configure", "COMPILED_BY=homebrew", "--prefix=#{prefix}", "--disable-debug", "--disable-dependency-tracking"
     system "make install"
diff --git a/Library/Formula/proj.rb b/Library/Formula/proj.rb
index de8d7b281..22776b556 100644
--- a/Library/Formula/proj.rb
+++ b/Library/Formula/proj.rb
@@ -15,7 +15,7 @@ class Proj <Formula
   end
 
   def install
-    ENV.gcc_4_2
+    fails_with_llvm
 
     # The datum grid files are required to support datum shifting
     d = Dir.getwd
diff --git a/Library/Formula/protobuf.rb b/Library/Formula/protobuf.rb
index 3f897c122..ba1f42597 100644
--- a/Library/Formula/protobuf.rb
+++ b/Library/Formula/protobuf.rb
@@ -6,7 +6,7 @@ class Protobuf <Formula
   homepage 'http://code.google.com/p/protobuf/'
  
   def install
-    ENV.gcc_4_2
+    fails_with_llvm
     system "./configure", "--prefix=#{prefix}", "--disable-debug", 
                           "--disable-dependency-tracking",
                           "--with-zlib"
diff --git a/Library/Formula/pv.rb b/Library/Formula/pv.rb
index e096e34ed..8e97a2d32 100644
--- a/Library/Formula/pv.rb
+++ b/Library/Formula/pv.rb
@@ -4,12 +4,11 @@ class Pv <Formula
   url 'http://pipeviewer.googlecode.com/files/pv-1.1.4.tar.bz2'
   homepage 'http://www.ivarch.com/programs/pv.shtml'
   md5 '63033e090d61a040407bfd043aeb6d27'
-  
+
   aka 'pipeviewer'
 
   def install
-    ENV.gcc_4_2
-
+    fails_with_llvm
     system "./configure", "--disable-debug", "--disable-dependency-tracking",
                           "--prefix=#{prefix}",
                           "--mandir=#{man}",
diff --git a/Library/Formula/redis.rb b/Library/Formula/redis.rb
index a20079ed0..bb1dfb931 100644
--- a/Library/Formula/redis.rb
+++ b/Library/Formula/redis.rb
@@ -7,7 +7,7 @@ class Redis <Formula
   sha1 'c71aef0b3f31acb66353d86ba57dd321b541043f'
 
   def install
-    ENV.gcc_4_2 # Breaks with LLVM
+    fails_with_llvm "Breaks with LLVM"
     system "make"
 
     %w( redis-benchmark redis-cli redis-server redis-stat redis-check-dump ).each { |p|
diff --git a/Library/Formula/redland.rb b/Library/Formula/redland.rb
index dfe27c726..f2aef3109 100644
--- a/Library/Formula/redland.rb
+++ b/Library/Formula/redland.rb
@@ -11,8 +11,7 @@ class Redland <Formula
   depends_on 'berkeley-db' => :optional
 
   def install
-    ENV.gcc_4_2
-
+    fails_with_llvm
     system "./configure", "--prefix=#{prefix}",
                           "--disable-debug",
                           "--disable-dependency-tracking",
diff --git a/Library/Formula/ruby-enterprise-edition.rb b/Library/Formula/ruby-enterprise-edition.rb
index 3ba43ce8a..f8e2f13fe 100644
--- a/Library/Formula/ruby-enterprise-edition.rb
+++ b/Library/Formula/ruby-enterprise-edition.rb
@@ -12,7 +12,7 @@ class RubyEnterpriseEdition <Formula
   aka :ree
 
   def install
-    ENV.gcc_4_2 # fails with LLVM
+    fails_with_llvm "fails with LLVM"
     args = ['./installer', "--auto", prefix, '--no-tcmalloc']
     args << '-c' << '--enable-shared' if ARGV.include?('--enable-shared')
     system *args
diff --git a/Library/Formula/ruby.rb b/Library/Formula/ruby.rb
index 48acdaaa7..2817b9dbb 100644
--- a/Library/Formula/ruby.rb
+++ b/Library/Formula/ruby.rb
@@ -18,7 +18,7 @@ class Ruby <Formula
   end
   
   def install
-    ENV.gcc_4_2
+    fails_with_llvm
 
     args = [ "--prefix=#{prefix}",
             "--disable-debug",
diff --git a/Library/Formula/sdl.rb b/Library/Formula/sdl.rb
index f71cdde64..81bcd2b95 100644
--- a/Library/Formula/sdl.rb
+++ b/Library/Formula/sdl.rb
@@ -13,7 +13,7 @@ class Sdl <Formula
   end
 
   def install
-    ENV.gcc_4_2
+    fails_with_llvm
     Sdl.use_homebrew_prefix %w[sdl.pc.in sdl-config.in]
 
     system "./configure", "--prefix=#{prefix}", "--disable-debug",
diff --git a/Library/Formula/sphinx.rb b/Library/Formula/sphinx.rb
index d1609aafc..9151b19e7 100644
--- a/Library/Formula/sphinx.rb
+++ b/Library/Formula/sphinx.rb
@@ -6,9 +6,7 @@ class Sphinx <Formula
   md5 '7b9b618cb9b378f949bb1b91ddcc4f54'
 
   def install
-    # fails with llvm-gcc:
-    # ld: rel32 out of range in _GetPrivateProfileString from /usr/lib/libodbc.a(SQLGetPrivateProfileString.o)
-    ENV.gcc_4_2
+    fails_with_llvm "fails with: ld: rel32 out of range in _GetPrivateProfileString from /usr/lib/libodbc.a(SQLGetPrivateProfileString.o)"
 
     config_args = ["--prefix=#{prefix}", "--disable-debug", "--disable-dependency-tracking"]
     # configure script won't auto-select PostgreSQL
diff --git a/Library/Formula/spin.rb b/Library/Formula/spin.rb
index 55a42be5b..c61c9e5aa 100644
--- a/Library/Formula/spin.rb
+++ b/Library/Formula/spin.rb
@@ -11,7 +11,7 @@ class Spin <Formula
   end
 
   def install
-    ENV.gcc_4_2
+    fails_with_llvm
     ENV.deparallelize
 
     # Compile and install the binary.
diff --git a/Library/Formula/streamripper.rb b/Library/Formula/streamripper.rb
index 0676c3be5..ba3ea7363 100644
--- a/Library/Formula/streamripper.rb
+++ b/Library/Formula/streamripper.rb
@@ -8,7 +8,7 @@ class Streamripper <Formula
   depends_on 'glib'
 
   def install
-    ENV.gcc_4_2 # strange runtime errors with llvm
+    fails_with_llvm "strange runtime errors with llvm"
     File.chmod 0755, "./install-sh" # without this 'make install' doesn't seem to work (permission denied)
     system "./configure", "--prefix=#{prefix}", "--disable-debug", "--disable-dependency-tracking"
     system "make install"
diff --git a/Library/Formula/syck.rb b/Library/Formula/syck.rb
index 6e5c0bdf9..7c08fef05 100644
--- a/Library/Formula/syck.rb
+++ b/Library/Formula/syck.rb
@@ -6,7 +6,7 @@ class Syck <Formula
   md5 '198f925b4ed7fe04a182c35014498634'
 
   def install
-    ENV.gcc_4_2
+    fails_with_llvm
     system "./configure", "--prefix=#{prefix}", "--disable-debug", "--disable-dependency-tracking"
     system "make install"
   end
diff --git a/Library/Formula/tesseract.rb b/Library/Formula/tesseract.rb
index c93fa3cc6..b86a9e5cf 100644
--- a/Library/Formula/tesseract.rb
+++ b/Library/Formula/tesseract.rb
@@ -25,8 +25,7 @@ class Tesseract <Formula
   end
 
   def install
-    # Executable 'tesseract' segfaults on 10.6 when compiled with llvm-gcc (LLVM build 2206)
-    ENV.gcc_4_2
+    fails_with_llvm "Executable 'tesseract' segfaults on 10.6 when compiled with llvm-gcc", :build => "2206"
 
     # 'make install' expects the language data files in the build directory
     d = Dir.getwd
diff --git a/Library/Formula/tex-live.rb b/Library/Formula/tex-live.rb
index 1e168dcb2..a8b57424a 100644
--- a/Library/Formula/tex-live.rb
+++ b/Library/Formula/tex-live.rb
@@ -100,8 +100,7 @@ class TexLive <Formula
     # Notes:
     # Several OSX-specific files (texk/web2c/xetexdir/XeTeXFontMgr_Mac.mm and others) can't build in 
     # 64 bit mode on OSX, since they use deprecated functions only available when building in 32bit.
-    
-    ENV.gcc_4_2
+    fails_with_llvm
     ENV.m32
     ENV.deparallelize
     
diff --git a/Library/Formula/unittest.rb b/Library/Formula/unittest.rb
index 9d3d3b1f5..80a9c1e35 100644
--- a/Library/Formula/unittest.rb
+++ b/Library/Formula/unittest.rb
@@ -6,7 +6,7 @@ class Unittest <Formula
   @md5='6eaa2823620c2e21fc745bd8da6a26b2'
 
   def install
-    ENV.gcc_4_2
+    fails_with_llvm
     system "./configure", "--prefix=#{prefix}", "--disable-debug", "--disable-dependency-tracking"
     system "make install"
   end
diff --git a/Library/Formula/vice.rb b/Library/Formula/vice.rb
index 74fdbcecb..c9da2dee5 100644
--- a/Library/Formula/vice.rb
+++ b/Library/Formula/vice.rb
@@ -16,9 +16,8 @@ class Vice <Formula
   end
   
   def install
+    fails_with_llvm "Cannot build with LLVM"
     ENV.libpng
-    # Cannot build with LLVM
-    ENV.gcc_4_2
 
     # Disable the zlibtest, we know we have it.
     # Use Cocoa instead of X
diff --git a/Library/Formula/visualboyadvance.rb b/Library/Formula/visualboyadvance.rb
index 4e8045d31..d75ae8538 100644
--- a/Library/Formula/visualboyadvance.rb
+++ b/Library/Formula/visualboyadvance.rb
@@ -14,8 +14,8 @@ class Visualboyadvance <Formula
   end
 
   def install
+    fails_with_llvm "Video scalers don't link right w/ LLVM"
     ENV.x11 # for libpng
-    ENV.gcc_4_2 # Video scalers don't link right w/ LLVM
     
     system "./configure", "--prefix=#{prefix}", "--disable-debug",
                           "--disable-dependency-tracking",
diff --git a/Library/Formula/vpnc.rb b/Library/Formula/vpnc.rb
index 9d105ee63..109b9532c 100644
--- a/Library/Formula/vpnc.rb
+++ b/Library/Formula/vpnc.rb
@@ -19,7 +19,7 @@ class Vpnc <Formula
   end
 
   def install
-    ENV.gcc_4_2
+    fails_with_llvm
     ENV.no_optimization 
     ENV.deparallelize
 
diff --git a/Library/Formula/w3m.rb b/Library/Formula/w3m.rb
index da411721c..ace23cd3e 100644
--- a/Library/Formula/w3m.rb
+++ b/Library/Formula/w3m.rb
@@ -8,7 +8,7 @@ class W3m <Formula
   depends_on 'bdw-gc'
 
   def install
-    ENV.gcc_4_2
+    fails_with_llvm
     system "./configure", "--prefix=#{prefix}", "--disable-debug", "--disable-dependency-tracking", "--disable-image"
     system "make install"
   end
diff --git a/Library/Formula/wine.rb b/Library/Formula/wine.rb
index b3c21d58f..9c6aec0fc 100644
--- a/Library/Formula/wine.rb
+++ b/Library/Formula/wine.rb
@@ -17,8 +17,7 @@ EOS
   end
 
   def install
-    # Wine does not compile with LLVM yet
-    ENV.gcc_4_2
+    fails_with_llvm
     ENV.x11
 
     # Make sure we build 32bit version, because Wine64 is not fully functional yet
-- 
cgit v1.2.3