mysql/percona: remove readline cruft

It does not appear to be possible to make mysql or percona link against
GNU readline anymore, since mysql stopped bundling it.

2 files changed, 2 insertions, 9 deletions

diff --git a/Library/Formula/mysql.rb b/Library/Formula/mysql.rb
index 6ec1f95a3..004d84146 100644
--- a/Library/Formula/mysql.rb
+++ b/Library/Formula/mysql.rb
@@ -18,7 +18,6 @@ class Mysql < Formula
   option :universal
   option 'with-tests', 'Build with unit tests'
   option 'with-embedded', 'Build the embedded server'
-  option 'with-libedit', 'Compile with editline wrapper instead of readline'
   option 'with-archive-storage-engine', 'Compile with the ARCHIVE storage engine enabled'
   option 'with-blackhole-storage-engine', 'Compile with the BLACKHOLE storage engine enabled'
   option 'enable-local-infile', 'Build with local infile loading support'
@@ -67,6 +66,7 @@ class Mysql < Formula
       -DDEFAULT_COLLATION=utf8_general_ci
       -DSYSCONFDIR=#{etc}
       -DCOMPILATION_COMMENT=Homebrew
+      -DWITH_EDITLINE=system
     ]
 
     # To enable unit testing at build, we need to download the unit testing suite
@@ -79,9 +79,6 @@ class Mysql < Formula
     # Build the embedded server
     args << "-DWITH_EMBEDDED_SERVER=ON" if build.with? 'embedded'
 
-    # Compile with readline unless libedit is explicitly chosen
-    args << "-DWITH_READLINE=yes" unless build.with? 'libedit'
-
     # Compile with ARCHIVE engine enabled if chosen
     args << "-DWITH_ARCHIVE_STORAGE_ENGINE=1" if build.with? 'archive-storage-engine'
 
diff --git a/Library/Formula/percona-server.rb b/Library/Formula/percona-server.rb
index d619205b5..86d6d61e9 100644
--- a/Library/Formula/percona-server.rb
+++ b/Library/Formula/percona-server.rb
@@ -7,13 +7,11 @@ class PerconaServer < Formula
   sha1 '6d9ddd92338c70ec13bdeb9a23568a990a5766f9'
 
   depends_on 'cmake' => :build
-  depends_on 'readline'
   depends_on 'pidof' unless MacOS.version >= :mountain_lion
 
   option :universal
   option 'with-tests', 'Build with unit tests'
   option 'with-embedded', 'Build the embedded server'
-  option 'with-libedit', 'Compile with editline wrapper instead of readline'
   option 'enable-local-infile', 'Build with local infile loading support'
 
 
@@ -67,6 +65,7 @@ class PerconaServer < Formula
       -DDEFAULT_COLLATION=utf8_general_ci
       -DSYSCONFDIR=#{etc}
       -DCOMPILATION_COMMENT=Homebrew
+      -DWITH_EDITLINE=system
       -DCMAKE_BUILD_TYPE=RelWithDebInfo
     ]
 
@@ -87,9 +86,6 @@ class PerconaServer < Formula
     # Build the embedded server
     args << "-DWITH_EMBEDDED_SERVER=ON" if build.with? 'embedded'
 
-    # Compile with readline unless libedit is explicitly chosen
-    args << "-DWITH_READLINE=yes" unless build.with? 'libedit'
-
     # Make universal for binding to universal applications
     args << "-DCMAKE_OSX_ARCHITECTURES='#{Hardware::CPU.universal_archs.as_cmake_arch_flags}'" if build.universal?