diff options
| -rw-r--r-- | Library/Formula/automake.rb | 1 | ||||
| -rw-r--r-- | Library/Formula/couchdb.rb | 13 | ||||
| -rw-r--r-- | Library/Formula/freeradius-server.rb | 1 | ||||
| -rw-r--r-- | Library/Formula/ganglia.rb | 2 | ||||
| -rw-r--r-- | Library/Formula/gnu-smalltalk.rb | 1 | ||||
| -rw-r--r-- | Library/Formula/libmp3splt.rb | 1 | ||||
| -rw-r--r-- | Library/Formula/libslax.rb | 3 | ||||
| -rw-r--r-- | Library/Formula/mobile-shell.rb | 2 | ||||
| -rw-r--r-- | Library/Formula/mpich2.rb | 2 | ||||
| -rw-r--r-- | Library/Formula/rabbitmq-c.rb | 4 | ||||
| -rw-r--r-- | Library/Formula/transmission.rb | 2 |
11 files changed, 12 insertions, 20 deletions
diff --git a/Library/Formula/automake.rb b/Library/Formula/automake.rb index ae31a1448..a48bf1d2c 100644 --- a/Library/Formula/automake.rb +++ b/Library/Formula/automake.rb @@ -12,7 +12,6 @@ class Automake < Formula sha1 '12d0d7d3b6d31ea4faf9551076225343e9a5af1f' => :lion end - # Always needs a newer autoconf, even on Snow Leopard. depends_on 'autoconf' => :run keg_only :provided_until_xcode43 diff --git a/Library/Formula/couchdb.rb b/Library/Formula/couchdb.rb index 080f1c185..f0a35acad 100644 --- a/Library/Formula/couchdb.rb +++ b/Library/Formula/couchdb.rb @@ -8,13 +8,12 @@ class Couchdb < Formula head do url 'http://git-wip-us.apache.org/repos/asf/couchdb.git' - depends_on :automake => :build - depends_on :libtool => :build - # CouchDB >=1.3.0 requires autoconf 2.63 or higher - depends_on 'autoconf' => :build - depends_on 'autoconf-archive' => :build - depends_on 'pkg-config' => :build - depends_on 'help2man' => :build + depends_on "autoconf" => :build + depends_on "automake" => :build + depends_on "libtool" => :build + depends_on "autoconf-archive" => :build + depends_on "pkg-config" => :build + depends_on "help2man" => :build end depends_on 'spidermonkey' diff --git a/Library/Formula/freeradius-server.rb b/Library/Formula/freeradius-server.rb index e901626ae..373f7b550 100644 --- a/Library/Formula/freeradius-server.rb +++ b/Library/Formula/freeradius-server.rb @@ -5,7 +5,6 @@ class FreeradiusServer < Formula url 'ftp://ftp.freeradius.org/pub/freeradius/freeradius-server-2.2.2.tar.gz' sha1 '6aaa14169c20f257dcd5dcc61da0d0f985e9b5cc' - # Requires newer autotools on all platforms depends_on 'autoconf' => :build depends_on 'automake' => :build depends_on 'libtool' => :build diff --git a/Library/Formula/ganglia.rb b/Library/Formula/ganglia.rb index 9ab00dafb..f378b07fe 100644 --- a/Library/Formula/ganglia.rb +++ b/Library/Formula/ganglia.rb @@ -7,7 +7,7 @@ class Ganglia < Formula conflicts_with 'coreutils', :because => 'both install `gstat` binaries' - depends_on 'pkg-config' => :build # to find APR + depends_on 'pkg-config' => :build depends_on 'confuse' depends_on 'pcre' depends_on 'rrdtool' diff --git a/Library/Formula/gnu-smalltalk.rb b/Library/Formula/gnu-smalltalk.rb index c45313b50..e5625c2a3 100644 --- a/Library/Formula/gnu-smalltalk.rb +++ b/Library/Formula/gnu-smalltalk.rb @@ -17,7 +17,6 @@ class GnuSmalltalk < Formula option 'tests', 'Verify the build with make check (this may hang)' option 'tcltk', 'Build the Tcl/Tk module that requires X11' - # Need newer versions on Snow Leopard depends_on 'autoconf' => :build depends_on 'automake' => :build depends_on 'libtool' => :build diff --git a/Library/Formula/libmp3splt.rb b/Library/Formula/libmp3splt.rb index a050caccc..8b8bba4d6 100644 --- a/Library/Formula/libmp3splt.rb +++ b/Library/Formula/libmp3splt.rb @@ -5,7 +5,6 @@ class Libmp3splt < Formula url 'https://downloads.sourceforge.net/project/mp3splt/libmp3splt/0.8.2/libmp3splt-0.8.2.tar.gz' sha1 '5c8539391e26d047c30360b1dde2c08e6a02061f' - # Linking fails on 10.6 (and lower?) without a duplicate libtool; see #10350 depends_on 'libtool' => :build depends_on 'pkg-config' => :build depends_on 'gettext' diff --git a/Library/Formula/libslax.rb b/Library/Formula/libslax.rb index 5b6a8f693..9f3a31ac8 100644 --- a/Library/Formula/libslax.rb +++ b/Library/Formula/libslax.rb @@ -22,8 +22,7 @@ class Libslax < Formula depends_on 'curl' if MacOS.version <= :lion def install - # If build from read run script to run autoconf - system "sh ./bin/setup.sh" if build.head? + system "sh", "./bin/setup.sh" if build.head? system "./configure", "--disable-dependency-tracking", "--prefix=#{prefix}", diff --git a/Library/Formula/mobile-shell.rb b/Library/Formula/mobile-shell.rb index dab76bb18..04a076f43 100644 --- a/Library/Formula/mobile-shell.rb +++ b/Library/Formula/mobile-shell.rb @@ -8,8 +8,6 @@ class MobileShell < Formula head do url 'https://github.com/keithw/mosh.git' - # Needs new autoconf for correct AC_C_RESTRICT macro - # See: https://github.com/keithw/mosh/issues/241 depends_on 'autoconf' => :build depends_on 'automake' => :build end diff --git a/Library/Formula/mpich2.rb b/Library/Formula/mpich2.rb index ffc6790a5..7e1df234c 100644 --- a/Library/Formula/mpich2.rb +++ b/Library/Formula/mpich2.rb @@ -32,7 +32,7 @@ class Mpich2 < Formula if build.head? # ensure that the consistent set of autotools built by homebrew is used to # build MPICH, otherwise very bizarre build errors can occur - ENV['MPICH_AUTOTOOLS_DIR'] = (HOMEBREW_PREFIX+'bin') + ENV['MPICH_AUTOTOOLS_DIR'] = HOMEBREW_PREFIX+'bin' system "./autogen.sh" end diff --git a/Library/Formula/rabbitmq-c.rb b/Library/Formula/rabbitmq-c.rb index f5b9bd8a1..fbf2ee88f 100644 --- a/Library/Formula/rabbitmq-c.rb +++ b/Library/Formula/rabbitmq-c.rb @@ -10,9 +10,9 @@ class RabbitmqC < Formula option :universal depends_on 'pkg-config' => :build - depends_on 'autoconf' => :build # Use a newer version on Snow Leopard too + depends_on 'autoconf' => :build depends_on 'automake' => :build - depends_on :libtool + depends_on 'libtool' => :build depends_on 'rabbitmq' depends_on 'simplejson' => :python if MacOS.version <= :leopard diff --git a/Library/Formula/transmission.rb b/Library/Formula/transmission.rb index cac8d7348..11175941f 100644 --- a/Library/Formula/transmission.rb +++ b/Library/Formula/transmission.rb @@ -7,7 +7,7 @@ class Transmission < Formula option 'with-nls', 'Build with native language support' - depends_on 'pkg-config' => :build # So it will find system libcurl + depends_on 'pkg-config' => :build depends_on 'curl' if MacOS.version <= :leopard depends_on 'libevent' |
