Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

Don't override default -O flag.

Way back in the day, Homebrew defaulted to LLVM/-O3. A lot of stuff
failed to compile, and a lot of stuff just took forever with -O4.

We don't default this way anymore, and in fact use -Os per Apple
guidelines.

So remove these old "fixes" since they are no longer needed.
  • Loading branch information...
commit 200c36200da7679b9bd1384dbb5ad32266d16b91 1 parent 0568780
@adamv adamv authored
View
3  Library/Formula/berkeley-db.rb
@@ -1,8 +1,8 @@
require 'formula'
class BerkeleyDb < Formula
- url 'http://download.oracle.com/berkeley-db/db-5.3.15.tar.gz'
homepage 'http://www.oracle.com/technology/products/berkeley-db/index.html'
+ url 'http://download.oracle.com/berkeley-db/db-5.3.15.tar.gz'
md5 '5493fb5f7cc3915887c836b096f18773'
def options
@@ -12,7 +12,6 @@ def options
def install
# BerkeleyDB dislikes parallel builds
ENV.deparallelize
- ENV.O3 # takes an hour or more with link time optimisation
args = ["--disable-debug",
"--prefix=#{prefix}", "--mandir=#{man}",
View
4 Library/Formula/gettext.rb
@@ -1,10 +1,10 @@
require 'formula'
class Gettext < Formula
+ homepage 'http://www.gnu.org/software/gettext/'
url 'http://ftpmirror.gnu.org/gettext/gettext-0.18.1.1.tar.gz'
mirror 'http://ftp.gnu.org/gnu/gettext/gettext-0.18.1.1.tar.gz'
md5 '3dd55b952826d2b32f51308f2f91aa89'
- homepage 'http://www.gnu.org/software/gettext/'
keg_only "OS X provides the BSD gettext library and some software gets confused if both are in the library path."
@@ -30,8 +30,6 @@ def patches
def install
ENV.libxml2
- ENV.O3 # Issues with LLVM & O4 on Mac Pro 10.6
-
ENV.universal_binary if ARGV.build_universal?
system "./configure", "--disable-dependency-tracking", "--disable-debug",
View
4 Library/Formula/ghostscript.rb
@@ -31,10 +31,8 @@ def move_included_source_copies
def install
ENV.libpng
ENV.deparallelize
- # O4 takes an ungodly amount of time
- ENV.O3
# ghostscript configure ignores LDFLAGs apparently
- ENV['LIBS']="-L/usr/X11/lib"
+ ENV['LIBS'] = "-L/usr/X11/lib"
src_dir = ARGV.build_head? ? "gs" : "."
View
5 Library/Formula/imagemagick.rb
@@ -47,12 +47,14 @@ def quantum_depth_32?
class Imagemagick < Formula
+ homepage 'http://www.imagemagick.org'
+
# Using an unofficial Git mirror to work around:
# * Stable tarballs disappearing
# * Bad https cert on official SVN repo
url 'https://github.com/trevor/ImageMagick/tarball/6.7.1-1'
md5 '9c71dfbddc42b78a0d8db8acdb534d37'
- homepage 'http://www.imagemagick.org'
+
head 'https://github.com/trevor/ImageMagick.git'
bottle do
@@ -94,7 +96,6 @@ def options
def install
ENV.x11 # Add to PATH for freetype-config on Snow Leopard
- ENV.O3 # takes forever otherwise
args = [ "--disable-osx-universal-binary",
"--without-perl", # I couldn't make this compile
View
69 Library/Formula/xapian.rb
@@ -1,14 +1,14 @@
require 'formula'
class XapianBindings < Formula
- url 'http://oligarchy.co.uk/xapian/1.2.7/xapian-bindings-1.2.7.tar.gz'
homepage 'http://xapian.org'
+ url 'http://oligarchy.co.uk/xapian/1.2.7/xapian-bindings-1.2.7.tar.gz'
sha1 '79e9f0b01f1af3440d10d00469dbe248784ffa1c'
end
class Xapian < Formula
- url 'http://oligarchy.co.uk/xapian/1.2.7/xapian-core-1.2.7.tar.gz'
homepage 'http://xapian.org'
+ url 'http://oligarchy.co.uk/xapian/1.2.7/xapian-core-1.2.7.tar.gz'
sha1 'c6c5c5b14d5d64481858ac2b181429a9b8bdc9a1'
def options
@@ -33,48 +33,45 @@ def arg_for_lang lang
end
def install
- ENV.O3 # takes forever otherwise
-
system "./configure", "--prefix=#{prefix}", "--disable-assertions",
"--disable-dependency-tracking"
system "make install"
+ return unless build_any_bindings?
- if build_any_bindings?
- XapianBindings.new.brew do
- args = [
- "XAPIAN_CONFIG=#{bin}/xapian-config",
- "--prefix=#{prefix}",
- "--disable-debug",
- "--disable-dependency-tracking",
- "--without-csharp",
- "--without-tcl"
- ]
-
- args << arg_for_lang('ruby')
- args << arg_for_lang('java')
+ XapianBindings.new.brew do
+ args = [
+ "XAPIAN_CONFIG=#{bin}/xapian-config",
+ "--prefix=#{prefix}",
+ "--disable-debug",
+ "--disable-dependency-tracking",
+ "--without-csharp",
+ "--without-tcl"
+ ]
- if ARGV.include? '--python'
- python_lib = lib + "python"
- ENV.append 'PYTHONPATH', python_lib
- python_lib.mkpath
- ENV['OVERRIDE_MACOSX_DEPLOYMENT_TARGET'] = '10.4'
- ENV['PYTHON_LIB'] = "#{python_lib}"
- args << "--with-python"
- else
- args << "--without-python"
- end
+ args << arg_for_lang('ruby')
+ args << arg_for_lang('java')
- if ARGV.include? '--php'
- extension_dir = lib+'php/extensions'
- extension_dir.mkpath
- args << "--with-php PHP_EXTENSION_DIR=#{extension_dir}"
- else
- args << "--without-php"
- end
+ if ARGV.include? '--python'
+ python_lib = lib + "python"
+ python_lib.mkpath
+ ENV.append 'PYTHONPATH', python_lib
+ ENV['OVERRIDE_MACOSX_DEPLOYMENT_TARGET'] = '10.4'
+ ENV['PYTHON_LIB'] = "#{python_lib}"
+ args << "--with-python"
+ else
+ args << "--without-python"
+ end
- system "./configure", *args
- system "make install"
+ if ARGV.include? '--php'
+ extension_dir = lib+'php/extensions'
+ extension_dir.mkpath
+ args << "--with-php PHP_EXTENSION_DIR=#{extension_dir}"
+ else
+ args << "--without-php"
end
+
+ system "./configure", *args
+ system "make install"
end
end
Please sign in to comment.
Something went wrong with that request. Please try again.