Update Python formula

* Add some optional dependencies
* Fix framework switches
* Remove library "optimization"; it breaks
  framework installs and other exotic builds

1 files changed, 10 insertions, 7 deletions

diff --git a/Library/Formula/python.rb b/Library/Formula/python.rb
index 38b334165..63f5f82df 100644
--- a/Library/Formula/python.rb
+++ b/Library/Formula/python.rb
@@ -5,8 +5,12 @@ class Python <Formula
   homepage 'http://www.python.org/'
   md5 'fee5408634a54e721a93531aba37f8c1'
 
-  # You can build Python without readline, but you really don't want to.
+  # You can build Python 2.6.4 without GNU readline, but you really don't want to.
   depends_on 'readline' => :recommended
+  # http://docs.python.org/library/gdbm.html
+  depends_on 'gdbm' => :optional
+  # http://docs.python.org/library/sqlite3.html
+  depends_on 'sqlite' => :optional
 
   def patches
     # don't append space after completion
@@ -28,8 +32,11 @@ class Python <Formula
   def install
     args = ["--prefix=#{prefix}"]
     args << "--enable-framework" if ARGV.include? '--framework'
-    args << "--with-universal-archs=intel" << "--enable-universalsdk=/" if ARGV.include? '--universal' \
-            or ARGV.include? '--intel' # the old flag, preserved for back-compat
+    
+    # Note --intel is an old flag, supported here for back compat. but not documented in options.
+    if ARGV.include? '--universal' or ARGV.include? '--intel'
+      args << "--with-universal-archs=intel" << "--enable-universalsdk=/" << "--enable-universal-archs=all"
+    end
     
     # Speed up creation of libpython.a, backported from Unladen Swallow:
     # http://code.google.com/p/unladen-swallow/source/detail?r=856
@@ -38,9 +45,5 @@ class Python <Formula
     system "./configure", *args
     system "make"
     system "make install"
-    
-    # lib/python2.6/config contains a copy of libpython.a; make this a link instead
-    (lib+'python2.6/config/libpython2.6.a').unlink
-    (lib+'python2.6/config/libpython2.6.a').make_link lib+'libpython2.6.a'
   end
 end