Skip to content
This repository
Browse code

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
Adam Vandenberg authored February 25, 2012
3  Library/Formula/berkeley-db.rb
... ...
@@ -1,8 +1,8 @@
1 1
 require 'formula'
2 2
 
3 3
 class BerkeleyDb < Formula
4  
-  url 'http://download.oracle.com/berkeley-db/db-5.3.15.tar.gz'
5 4
   homepage 'http://www.oracle.com/technology/products/berkeley-db/index.html'
  5
+  url 'http://download.oracle.com/berkeley-db/db-5.3.15.tar.gz'
6 6
   md5 '5493fb5f7cc3915887c836b096f18773'
7 7
 
8 8
   def options
@@ -12,7 +12,6 @@ def options
12 12
   def install
13 13
     # BerkeleyDB dislikes parallel builds
14 14
     ENV.deparallelize
15  
-    ENV.O3 # takes an hour or more with link time optimisation
16 15
 
17 16
     args = ["--disable-debug",
18 17
             "--prefix=#{prefix}", "--mandir=#{man}",
4  Library/Formula/gettext.rb
... ...
@@ -1,10 +1,10 @@
1 1
 require 'formula'
2 2
 
3 3
 class Gettext < Formula
  4
+  homepage 'http://www.gnu.org/software/gettext/'
4 5
   url 'http://ftpmirror.gnu.org/gettext/gettext-0.18.1.1.tar.gz'
5 6
   mirror 'http://ftp.gnu.org/gnu/gettext/gettext-0.18.1.1.tar.gz'
6 7
   md5 '3dd55b952826d2b32f51308f2f91aa89'
7  
-  homepage 'http://www.gnu.org/software/gettext/'
8 8
 
9 9
   keg_only "OS X provides the BSD gettext library and some software gets confused if both are in the library path."
10 10
 
@@ -30,8 +30,6 @@ def patches
30 30
 
31 31
   def install
32 32
     ENV.libxml2
33  
-    ENV.O3 # Issues with LLVM & O4 on Mac Pro 10.6
34  
-
35 33
     ENV.universal_binary if ARGV.build_universal?
36 34
 
37 35
     system "./configure", "--disable-dependency-tracking", "--disable-debug",
4  Library/Formula/ghostscript.rb
@@ -31,10 +31,8 @@ def move_included_source_copies
31 31
   def install
32 32
     ENV.libpng
33 33
     ENV.deparallelize
34  
-    # O4 takes an ungodly amount of time
35  
-    ENV.O3
36 34
     # ghostscript configure ignores LDFLAGs apparently
37  
-    ENV['LIBS']="-L/usr/X11/lib"
  35
+    ENV['LIBS'] = "-L/usr/X11/lib"
38 36
 
39 37
     src_dir = ARGV.build_head? ? "gs" : "."
40 38
 
5  Library/Formula/imagemagick.rb
@@ -47,12 +47,14 @@ def quantum_depth_32?
47 47
 
48 48
 
49 49
 class Imagemagick < Formula
  50
+  homepage 'http://www.imagemagick.org'
  51
+
50 52
   # Using an unofficial Git mirror to work around:
51 53
   # * Stable tarballs disappearing
52 54
   # * Bad https cert on official SVN repo
53 55
   url 'https://github.com/trevor/ImageMagick/tarball/6.7.1-1'
54 56
   md5 '9c71dfbddc42b78a0d8db8acdb534d37'
55  
-  homepage 'http://www.imagemagick.org'
  57
+
56 58
   head 'https://github.com/trevor/ImageMagick.git'
57 59
 
58 60
   bottle do
@@ -94,7 +96,6 @@ def options
94 96
 
95 97
   def install
96 98
     ENV.x11 # Add to PATH for freetype-config on Snow Leopard
97  
-    ENV.O3 # takes forever otherwise
98 99
 
99 100
     args = [ "--disable-osx-universal-binary",
100 101
              "--without-perl", # I couldn't make this compile
69  Library/Formula/xapian.rb
... ...
@@ -1,14 +1,14 @@
1 1
 require 'formula'
2 2
 
3 3
 class XapianBindings < Formula
4  
-  url 'http://oligarchy.co.uk/xapian/1.2.7/xapian-bindings-1.2.7.tar.gz'
5 4
   homepage 'http://xapian.org'
  5
+  url 'http://oligarchy.co.uk/xapian/1.2.7/xapian-bindings-1.2.7.tar.gz'
6 6
   sha1 '79e9f0b01f1af3440d10d00469dbe248784ffa1c'
7 7
 end
8 8
 
9 9
 class Xapian < Formula
10  
-  url 'http://oligarchy.co.uk/xapian/1.2.7/xapian-core-1.2.7.tar.gz'
11 10
   homepage 'http://xapian.org'
  11
+  url 'http://oligarchy.co.uk/xapian/1.2.7/xapian-core-1.2.7.tar.gz'
12 12
   sha1 'c6c5c5b14d5d64481858ac2b181429a9b8bdc9a1'
13 13
 
14 14
   def options
@@ -33,48 +33,45 @@ def arg_for_lang lang
33 33
   end
34 34
 
35 35
   def install
36  
-    ENV.O3 # takes forever otherwise
37  
-
38 36
     system "./configure", "--prefix=#{prefix}", "--disable-assertions",
39 37
                           "--disable-dependency-tracking"
40 38
     system "make install"
  39
+    return unless build_any_bindings?
41 40
 
42  
-    if build_any_bindings?
43  
-      XapianBindings.new.brew do
44  
-        args = [
45  
-          "XAPIAN_CONFIG=#{bin}/xapian-config",
46  
-          "--prefix=#{prefix}",
47  
-          "--disable-debug",
48  
-          "--disable-dependency-tracking",
49  
-          "--without-csharp",
50  
-          "--without-tcl"
51  
-        ]
52  
-
53  
-        args << arg_for_lang('ruby')
54  
-        args << arg_for_lang('java')
  41
+    XapianBindings.new.brew do
  42
+      args = [
  43
+        "XAPIAN_CONFIG=#{bin}/xapian-config",
  44
+        "--prefix=#{prefix}",
  45
+        "--disable-debug",
  46
+        "--disable-dependency-tracking",
  47
+        "--without-csharp",
  48
+        "--without-tcl"
  49
+      ]
55 50
 
56  
-        if ARGV.include? '--python'
57  
-          python_lib = lib + "python"
58  
-          ENV.append 'PYTHONPATH', python_lib
59  
-          python_lib.mkpath
60  
-          ENV['OVERRIDE_MACOSX_DEPLOYMENT_TARGET'] = '10.4'
61  
-          ENV['PYTHON_LIB'] = "#{python_lib}"
62  
-          args << "--with-python"
63  
-        else
64  
-          args << "--without-python"
65  
-        end
  51
+      args << arg_for_lang('ruby')
  52
+      args << arg_for_lang('java')
66 53
 
67  
-        if ARGV.include? '--php'
68  
-          extension_dir = lib+'php/extensions'
69  
-          extension_dir.mkpath
70  
-          args << "--with-php PHP_EXTENSION_DIR=#{extension_dir}"
71  
-        else
72  
-          args << "--without-php"
73  
-        end
  54
+      if ARGV.include? '--python'
  55
+        python_lib = lib + "python"
  56
+        python_lib.mkpath
  57
+        ENV.append 'PYTHONPATH', python_lib
  58
+        ENV['OVERRIDE_MACOSX_DEPLOYMENT_TARGET'] = '10.4'
  59
+        ENV['PYTHON_LIB'] = "#{python_lib}"
  60
+        args << "--with-python"
  61
+      else
  62
+        args << "--without-python"
  63
+      end
74 64
 
75  
-        system "./configure", *args
76  
-        system "make install"
  65
+      if ARGV.include? '--php'
  66
+        extension_dir = lib+'php/extensions'
  67
+        extension_dir.mkpath
  68
+        args << "--with-php PHP_EXTENSION_DIR=#{extension_dir}"
  69
+      else
  70
+        args << "--without-php"
77 71
       end
  72
+
  73
+      system "./configure", *args
  74
+      system "make install"
78 75
     end
79 76
   end
80 77
 

0 notes on commit 200c362

Please sign in to comment.
Something went wrong with that request. Please try again.