diff options
| author | Jack Nagel | 2013-12-16 13:23:59 -0600 |
|---|---|---|
| committer | Jack Nagel | 2013-12-16 13:27:03 -0600 |
| commit | b3e19afef502ba62e5354cdd6bccc65f9138edd7 (patch) | |
| tree | 85fe154bc49a1054fddcf6df2f7f94dd031e5a6e /Library/Formula | |
| parent | aedd41797f6ddf82e393d64d281aee0fe2e3dae5 (diff) | |
| download | homebrew-b3e19afef502ba62e5354cdd6bccc65f9138edd7.tar.bz2 | |
imagemagick: remove broken openmp option
This doesn't work for several reasons:
- the option is not declared anywhere
- the code in the class body checks for 'with-openmp', while the code
in the install method checks for 'enable-openmp'
- even after adding a 'with-openmp' option, trying to use it breaks the
formula because it tries to access ENV.compiler in the class body.
Given that this has been the case for quite some time and nobody has
complained, I'm removing this code altogether.
Diffstat (limited to 'Library/Formula')
| -rw-r--r-- | Library/Formula/graphicsmagick.rb | 7 | ||||
| -rw-r--r-- | Library/Formula/imagemagick.rb | 7 |
2 files changed, 4 insertions, 10 deletions
diff --git a/Library/Formula/graphicsmagick.rb b/Library/Formula/graphicsmagick.rb index 44a5846b9..d8b14958b 100644 --- a/Library/Formula/graphicsmagick.rb +++ b/Library/Formula/graphicsmagick.rb @@ -30,9 +30,6 @@ class Graphicsmagick < Formula depends_on 'ghostscript' => :optional opoo '--with-ghostscript is not recommended' if build.with? 'ghostscript' - if build.with? 'openmp' and (MacOS.version == :leopard or ENV.compiler == :clang) - opoo '--with-openmp is not supported on Leopard or with Clang' - end fails_with :llvm do build 2335 @@ -49,9 +46,9 @@ class Graphicsmagick < Formula "--disable-dependency-tracking", "--enable-shared", "--disable-static", - "--with-modules"] + "--with-modules", + "--disable-openmp"] - args << "--disable-openmp" unless build.include? 'enable-openmp' args << "--without-gslib" unless build.with? 'ghostscript' args << "--with-gs-font-dir=#{HOMEBREW_PREFIX}/share/ghostscript/fonts" unless build.with? 'ghostscript' args << "--without-magick-plus-plus" if build.without? 'magick-plus-plus' diff --git a/Library/Formula/imagemagick.rb b/Library/Formula/imagemagick.rb index 22f0164ae..d72f0e1dd 100644 --- a/Library/Formula/imagemagick.rb +++ b/Library/Formula/imagemagick.rb @@ -45,9 +45,6 @@ class Imagemagick < Formula depends_on 'webp' => :optional opoo '--with-ghostscript is not recommended' if build.with? 'ghostscript' - if build.with? 'openmp' and (MacOS.version == :leopard or ENV.compiler == :clang) - opoo '--with-openmp is not supported on Leopard or with Clang' - end def pour_bottle? # If libtool is keg-only it currently breaks the bottle. @@ -64,9 +61,9 @@ class Imagemagick < Formula "--enable-shared", "--disable-static", "--without-pango", - "--with-modules"] + "--with-modules", + "--disable-openmp"] - args << "--disable-openmp" unless build.include? 'enable-openmp' args << "--disable-opencl" if build.include? 'disable-opencl' args << "--without-gslib" unless build.with? 'ghostscript' args << "--without-perl" unless build.with? 'perl' |