From bdaae65b9af7e5a00c106bdbdb07992b5ad343de Mon Sep 17 00:00:00 2001 From: Jack Nagel Date: Sat, 10 Nov 2012 21:12:26 -0600 Subject: Revert "Rename readline to gnu-readline" This reverts commit adee5315265cc46aa6a3057071527abb16e1cd94. Turns out one of the "other things" is a dealbreaker. We only create kegs using a formula's canonical name. However, we do not check that this is the case when mapping existing kegs back to formula objects, and thus a keg with a name that happens to be an alias can fool Homebrew into thinking the canonically-named keg exists. So anything that enumerates kegs and then tries to do stuff with the resulting formula objects will just break. This is obviously worse than the debugger being broken, so reverting this for the time being. --- Library/Formula/python.rb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'Library/Formula/python.rb') diff --git a/Library/Formula/python.rb b/Library/Formula/python.rb index 47ba43e42..ec19c610a 100644 --- a/Library/Formula/python.rb +++ b/Library/Formula/python.rb @@ -32,7 +32,7 @@ class Python < Formula depends_on TkCheck.new depends_on 'pkg-config' => :build - depends_on 'gnu-readline' => :recommended + depends_on 'readline' => :recommended depends_on 'sqlite' => :recommended depends_on 'gdbm' => :recommended depends_on 'openssl' if build.include? 'with-brewed-openssl' @@ -205,7 +205,7 @@ class Python < Formula # superenv handles that cc finds includes/libs! inreplace "setup.py", "do_readline = self.compiler.find_library_file(lib_dirs, 'readline')", - "do_readline = '#{HOMEBREW_PREFIX}/opt/gnu-readline/lib/libhistory.dylib'" + "do_readline = '#{HOMEBREW_PREFIX}/opt/readline/lib/libhistory.dylib'" end end -- cgit v1.2.3