From 8d49cd53513286e997998651657c11f9ce9b4596 Mon Sep 17 00:00:00 2001 From: FX Coudert Date: Thu, 4 Oct 2018 21:31:06 +0200 Subject: [PATCH] mariadb@10.1: remove options --- Formula/mariadb@10.1.rb | 43 ++++++----------------------------------- 1 file changed, 6 insertions(+), 37 deletions(-) diff --git a/Formula/mariadb@10.1.rb b/Formula/mariadb@10.1.rb index c8a08bd567..b647972957 100644 --- a/Formula/mariadb@10.1.rb +++ b/Formula/mariadb@10.1.rb @@ -13,17 +13,6 @@ class MariadbAT101 < Formula keg_only :versioned_formula - option "with-test", "Keep test when installing" - option "with-bench", "Keep benchmark app when installing" - 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 "with-local-infile", "Build with local infile loading support" - - deprecated_option "enable-local-infile" => "with-local-infile" - deprecated_option "with-tests" => "with-test" - depends_on "cmake" => :build depends_on "openssl" @@ -45,7 +34,9 @@ class MariadbAT101 < Formula -DINSTALL_INFODIR=share/info -DINSTALL_MYSQLSHAREDIR=share/mysql -DWITH_PCRE=bundled + -DWITH_READLINE=yes -DWITH_SSL=yes + -DWITH_UNIT_TESTS=OFF -DDEFAULT_CHARSET=utf8mb4 -DDEFAULT_COLLATION=utf8mb4_general_ci -DINSTALL_SYSCONFDIR=#{etc} @@ -55,23 +46,6 @@ class MariadbAT101 < Formula # disable TokuDB, which is currently not supported on macOS args << "-DPLUGIN_TOKUDB=NO" - args << "-DWITH_UNIT_TESTS=OFF" if build.without? "test" - - # 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" if build.without? "libedit" - - # Compile with ARCHIVE engine enabled if chosen - args << "-DPLUGIN_ARCHIVE=YES" if build.with? "archive-storage-engine" - - # Compile with BLACKHOLE engine enabled if chosen - args << "-DPLUGIN_BLACKHOLE=YES" if build.with? "blackhole-storage-engine" - - # Build with local infile loading support - args << "-DENABLED_LOCAL_INFILE=1" if build.with? "local-infile" - system "cmake", ".", *std_cmake_args, *args system "make" system "make", "install" @@ -86,8 +60,9 @@ class MariadbAT101 < Formula # See: https://github.com/Homebrew/homebrew/issues/4975 rm_rf prefix/"data" - (prefix/"mysql-test").rmtree if build.without? "test" # save 121MB! - (prefix/"sql-bench").rmtree if build.without? "bench" + # Save space + (prefix/"mysql-test").rmtree + (prefix/"sql-bench").rmtree # Link the setup script into bin bin.install_symlink prefix/"scripts/mysql_install_db" @@ -167,12 +142,6 @@ class MariadbAT101 < Formula end test do - if build.with? "test" - (prefix/"mysql-test").cd do - system "./mysql-test-run.pl", "status" - end - else - system bin/"mysqld", "--version" - end + system bin/"mysqld", "--version" end end