diff options
Diffstat (limited to 'Library/Formula')
| -rw-r--r-- | Library/Formula/graphicsmagick.rb | 4 | ||||
| -rw-r--r-- | Library/Formula/imagemagick.rb | 4 | ||||
| -rw-r--r-- | Library/Formula/proj.rb | 11 | ||||
| -rw-r--r-- | Library/Formula/xapian.rb | 4 |
4 files changed, 8 insertions, 15 deletions
diff --git a/Library/Formula/graphicsmagick.rb b/Library/Formula/graphicsmagick.rb index f09847b1f..b5cdd6c2a 100644 --- a/Library/Formula/graphicsmagick.rb +++ b/Library/Formula/graphicsmagick.rb @@ -40,9 +40,7 @@ class Graphicsmagick < Formula build 2335 end - def skip_clean? path - path.extname == '.la' - end + skip_clean :la option 'with-ghostscript', 'Compile against ghostscript (not recommended.)' option 'without-magick-plus-plus', "Don't build C++ library." diff --git a/Library/Formula/imagemagick.rb b/Library/Formula/imagemagick.rb index b8a46f988..694ab4e03 100644 --- a/Library/Formula/imagemagick.rb +++ b/Library/Formula/imagemagick.rb @@ -59,9 +59,7 @@ class Imagemagick < Formula sha1 '019400feda06e4f277187702a4baeacdfdbf4851' => :snowleopard end - def skip_clean? path - path.extname == '.la' - end + skip_clean :la def patches # Fixes xml2-config that can be missing --prefix. See issue #11789 diff --git a/Library/Formula/proj.rb b/Library/Formula/proj.rb index c0fa9d145..6427a7920 100644 --- a/Library/Formula/proj.rb +++ b/Library/Formula/proj.rb @@ -6,23 +6,22 @@ class ProjDatumgrid < Formula end class Proj < Formula - url 'http://download.osgeo.org/proj/proj-4.8.0.tar.gz' homepage 'http://trac.osgeo.org/proj/' + url 'http://download.osgeo.org/proj/proj-4.8.0.tar.gz' sha1 '5c8d6769a791c390c873fef92134bf20bb20e82a' + skip_clean :la + fails_with :llvm do build 2334 end - def skip_clean? path - path.extname == '.la' - end - def install # The datum grid files are required to support datum shifting ProjDatumgrid.new.brew { cp Dir["*"], buildpath/'nad' } - system "./configure", "--prefix=#{prefix}", "--disable-dependency-tracking" + system "./configure", "--disable-dependency-tracking", + "--prefix=#{prefix}" system "make install" end end diff --git a/Library/Formula/xapian.rb b/Library/Formula/xapian.rb index fe3a39890..541423fdb 100644 --- a/Library/Formula/xapian.rb +++ b/Library/Formula/xapian.rb @@ -16,9 +16,7 @@ class Xapian < Formula option "python", "Python bindings" option "ruby", "Ruby bindings" - def skip_clean? path - path.extname == '.la' - end + skip_clean :la def build_any_bindings? build.include? 'ruby' or build.include? 'python' or build.include? 'java' or build.include? 'php' |
