MariaDB 5.2.7

Signed-off-by: Adam Vandenberg <flangy@gmail.com>

1 files changed, 12 insertions, 39 deletions

diff --git a/Library/Formula/mariadb.rb b/Library/Formula/mariadb.rb
index 26b9ad27b..1075c07e9 100644
--- a/Library/Formula/mariadb.rb
+++ b/Library/Formula/mariadb.rb
@@ -3,9 +3,9 @@ require 'formula'
 class Mariadb < Formula
   # You probably don't want to have this and MySQL's formula linked at the same time
   # Just saying.
-  url 'http://ftp.osuosl.org/pub/mariadb/mariadb-5.2.6/kvm-tarbake-jaunty-x86/mariadb-5.2.6.tar.gz'
+  url 'http://ftp.osuosl.org/pub/mariadb/mariadb-5.2.7/kvm-tarbake-jaunty-x86/mariadb-5.2.7.tar.gz'
   homepage 'http://mariadb.org/'
-  md5 'e562aca71ae16b490196f99aa7e64b55'
+  md5 '06b9b102946a3606b38348c0ebf18367'
 
   depends_on 'readline'
 
@@ -20,7 +20,7 @@ class Mariadb < Formula
 
   def install
     ENV['CXXFLAGS'] = ENV['CXXFLAGS'].gsub "-fomit-frame-pointer", ""
-    ENV['CXXFLAGS'] += " -fno-omit-frame-pointer -felide-constructors"
+    ENV['CXXFLAGS'] += " -O3 -fno-omit-frame-pointer -felide-constructors"
 
     # Make universal for bindings to universal applications
     ENV.universal_binary if ARGV.build_universal?
@@ -33,17 +33,18 @@ class Mariadb < Formula
       "--localstatedir=#{var}/mysql",
       "--sysconfdir=#{etc}",
       "--with-extra-charsets=complex",
-      "--with-ssl",
       "--without-readline",
       "--enable-assembler",
       "--enable-thread-safe-client",
-      "--enable-local-infile",
-      "--enable-shared",
       "--with-big-tables",
-      "--with-plugins=xtradb",
-      "--with-plugin-maria",
-      "--with-maria-tmp-tables",
-      "--without-plugin-innodb_plugin"
+      "--with-plugin-aria",
+      "--with-aria-tmp-tables",
+      "--without-plugin-innodb_plugin",
+      "--with-mysqld-ldflags=-static",
+      "--with-client-ldflags=-static",
+      "--with-plugins=max-no-ndb",
+      "--with-embedded-server",
+      "--with-libevent",
     ]
 
     configure_args << "--without-server" if ARGV.include? '--client-only'
@@ -105,32 +106,4 @@ class Mariadb < Formula
     </plist>
     EOPLIST
   end
-end
-
-
-__END__
---- old/scripts/mysqld_safe.sh	2009-09-02 04:10:39.000000000 -0400
-+++ new/scripts/mysqld_safe.sh	2009-09-02 04:52:55.000000000 -0400
-@@ -383,7 +383,7 @@
- fi
- 
- USER_OPTION=""
--if test -w / -o "$USER" = "root"
-+if test -w /sbin -o "$USER" = "root"
- then
-   if test "$user" != "root" -o $SET_USER = 1
-   then
-diff --git a/scripts/mysql_config.sh b/scripts/mysql_config.sh
-index efc8254..8964b70 100644
---- a/scripts/mysql_config.sh
-+++ b/scripts/mysql_config.sh
-@@ -132,7 +132,8 @@ for remove in DDBUG_OFF DSAFEMALLOC USAFEMALLOC DSAFE_MUTEX \
-               DEXTRA_DEBUG DHAVE_purify O 'O[0-9]' 'xO[0-9]' 'W[-A-Za-z]*' \
-               'mtune=[-A-Za-z0-9]*' 'mcpu=[-A-Za-z0-9]*' 'march=[-A-Za-z0-9]*' \
-               Xa xstrconst "xc99=none" AC99 \
--              unroll2 ip mp restrict
-+              unroll2 ip mp restrict \
-+              mmmx 'msse[0-9.]*' 'mfpmath=sse' w pipe 'fomit-frame-pointer' 'mmacosx-version-min=10.[0-9]'
- do
-   # The first option we might strip will always have a space before it because
-   # we set -I$pkgincludedir as the first option
+end
\ No newline at end of file