diff options
| author | Charlie Sharpsteen | 2011-08-29 12:12:04 -0700 |
|---|---|---|
| committer | Charlie Sharpsteen | 2011-09-03 09:05:13 -0700 |
| commit | ff3c1e40db3c825a6d6837136bebf10d271bb6b8 (patch) | |
| tree | 2909ce8fe6de298b95134b9951963fed38d57406 /Library/Formula | |
| parent | 6bbce227f1c365506de7794ddefd1f063caee95f (diff) | |
| download | homebrew-ff3c1e40db3c825a6d6837136bebf10d271bb6b8.tar.bz2 | |
GraphicsMagick: Build C++ lib by default
Issue #2950 mentions that the C++ lib was disabled because it caused LLVM
builds to fail. GraphicsMagick has since been flagged as `fails_with_llvm` so
this is a moot point and the increase in build time is negligible. A
`--without-magick-plus-plus` option has been added in case people want a lean
build.
Also removed ENV.O3 since it is pointless when `fails_with_llvm` is in effect.
Diffstat (limited to 'Library/Formula')
| -rw-r--r-- | Library/Formula/graphicsmagick.rb | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/Library/Formula/graphicsmagick.rb b/Library/Formula/graphicsmagick.rb index b5be0b7fd..98d74cfef 100644 --- a/Library/Formula/graphicsmagick.rb +++ b/Library/Formula/graphicsmagick.rb @@ -1,6 +1,6 @@ require 'formula' -# This formula used to drive from ImageMagick, but has diverged. +# This formula used to derive from ImageMagick, but has diverged. def ghostscript_fonts? File.directory? "#{HOMEBREW_PREFIX}/share/ghostscript/fonts" @@ -36,14 +36,13 @@ class Graphicsmagick < Formula def options [ ['--with-ghostscript', 'Compile against ghostscript (not recommended.)'], - ['--with-magick-plus-plus', 'With C++ library.'], + ['--without-magick-plus-plus', "Don't build C++ library."], ['--use-wmf', 'Compile with libwmf support.'], ] end def install ENV.x11 - ENV.O3 # Takes forever with O4 (LLVM) # versioned stuff in main tree is pointless for us inreplace 'configure', '${PACKAGE_NAME}-${PACKAGE_VERSION}', '${PACKAGE_NAME}' @@ -51,7 +50,7 @@ class Graphicsmagick < Formula args = ["--disable-dependency-tracking", "--prefix=#{prefix}", "--enable-shared", "--disable-static"] - args << "--without-magick-plus-plus" unless ARGV.include? '--with-magick-plus-plus' + args << "--without-magick-plus-plus" if ARGV.include? '--without-magick-plus-plus' args << "--disable-openmp" if MacOS.leopard? # libgomp unavailable args << "--with-gslib" if ghostscript_srsly? args << "--with-gs-font-dir=#{HOMEBREW_PREFIX}/share/ghostscript/fonts" \ |