From 0ad437bb15f9cdfb3a7a486fe6047e353fa7ce16 Mon Sep 17 00:00:00 2001 From: nibbles 2bits Date: Tue, 14 Aug 2012 00:45:15 -0700 Subject: ncmpcpp: add pkg-config, update fails_with ncmpcpp has a build-time dep on pkg-config so that it can find libmpdclient, and it needs the `fails_with` version updated because it still has problems with clang. Add a dep on pkg-config Update the fails_with build. Use the new options DSL. Tested on ML with clang and llvm from XCode-4.4.1. Fixes #14160 Closes #14172. Signed-off-by: Jack Nagel --- Library/Formula/ncmpcpp.rb | 22 ++++++++++------------ 1 file changed, 10 insertions(+), 12 deletions(-) (limited to 'Library/Formula/ncmpcpp.rb') diff --git a/Library/Formula/ncmpcpp.rb b/Library/Formula/ncmpcpp.rb index 9c64164cd..9d84c6001 100644 --- a/Library/Formula/ncmpcpp.rb +++ b/Library/Formula/ncmpcpp.rb @@ -5,21 +5,19 @@ class Ncmpcpp < Formula url 'http://unkart.ovh.org/ncmpcpp/ncmpcpp-0.5.10.tar.bz2' sha1 '5e34733e7fbaf2862f04fdf8af8195ce860a9014' + depends_on 'pkg-config' => :build depends_on 'taglib' depends_on 'libmpdclient' - depends_on 'fftw' if ARGV.include? "--visualizer" + depends_on 'fftw' if build.include? "visualizer" fails_with :clang do - build 318 + build 421 + cause "'itsTempString' is a private member of 'NCurses::basic_buffer'" end - def options - [ - ["--outputs", "Compile with mpd outputs control"], - ["--visualizer", "Compile with built-in visualizer"], - ["--clock", "Compile with optional clock tab"] - ] - end + option 'outputs', 'Compile with mpd outputs control' + option 'visualizer', 'Compile with built-in visualizer' + option 'clock', 'Compile with optional clock tab' def install ENV.append 'LDFLAGS', '-liconv' @@ -28,9 +26,9 @@ class Ncmpcpp < Formula "--with-taglib", "--with-curl", "--enable-unicode"] - args << '--enable-outputs' if ARGV.include?('--outputs') - args << '--enable-visualizer' if ARGV.include?('--visualizer') - args << '--enable-clock' if ARGV.include?('--clock') + args << '--enable-outputs' if build.include? 'outputs' + args << '--enable-visualizer' if build.include? 'visualizer' + args << '--enable-clock' if build.include? 'clock' system "./configure", *args system "make install" -- cgit v1.2.3