diff options
Diffstat (limited to 'Library/Formula')
| -rw-r--r-- | Library/Formula/ctail.rb | 10 | ||||
| -rw-r--r-- | Library/Formula/serf.rb | 16 |
2 files changed, 6 insertions, 20 deletions
diff --git a/Library/Formula/ctail.rb b/Library/Formula/ctail.rb index cfc570cf0..d62c52cc1 100644 --- a/Library/Formula/ctail.rb +++ b/Library/Formula/ctail.rb @@ -9,16 +9,6 @@ class Ctail < Formula depends_on :libtool def install - if MacOS.mountain_lion? - # Fixes a bad path returned by `apr-1-config --cpp` on ML. - # https://github.com/mxcl/homebrew/issues/13586 - ENV['CPP'] = "#{ENV.cc} -E" - # Use HB libtool not the one from apr that also has a bad path. - ENV['APR_LIBTOOL'] = 'glibtool' - # Especially for Xcode-only, the apr hearders are needed by glibtool - ENV.append 'CPPFLAGS', "-I#{MacOS.sdk_path}/usr/include/apr-1" - end - system "./configure", "--prefix=#{prefix}", "--disable-debug" system 'make' system 'make install' diff --git a/Library/Formula/serf.rb b/Library/Formula/serf.rb index d407b79b6..c20b89239 100644 --- a/Library/Formula/serf.rb +++ b/Library/Formula/serf.rb @@ -9,20 +9,16 @@ class Serf < Formula depends_on :libtool + def apr_bin + superbin or "/usr/bin" + end + def install ENV.universal_binary if build.universal? - if MacOS.mountain_lion? - # Fixes a bad path returned by `apr-1-config --cpp` on ML. - # https://github.com/mxcl/homebrew/issues/13586 - ENV['CPP'] = "#{ENV.cc} -E" - # Use HB libtool not the one from apr that also has a bad path. - ENV['APR_LIBTOOL'] = 'glibtool' - # Especially for Xcode-only, the apr hearders are needed by glibtool - ENV.append 'CPPFLAGS', "-I#{MacOS.sdk_path}/usr/include/apr-1" - end system "./configure", "--disable-debug", "--disable-dependency-tracking", - "--prefix=#{prefix}" + "--prefix=#{prefix}", + "--with-apr=#{apr_bin}" system "make install" end end |