aboutsummaryrefslogtreecommitdiffstats
path: root/Library/Formula
diff options
context:
space:
mode:
authorJack Nagel2012-01-26 20:08:03 -0600
committerJack Nagel2012-01-26 20:58:50 -0600
commit1a6f356bcfbbb9f4277bf6716b95e763d425ec63 (patch)
treee80dbcd98cc69020ce18cabf73e8c06b02e3caea /Library/Formula
parent3a0aa7b6829599c442a9880add132fae66547e86 (diff)
downloadhomebrew-1a6f356bcfbbb9f4277bf6716b95e763d425ec63.tar.bz2
mariadb 5.2.10
- Add upstream patches to fix some compilation issues - Simplify setting CXXFLAGS Signed-off-by: Jack Nagel <jacknagel@gmail.com>
Diffstat (limited to 'Library/Formula')
-rw-r--r--Library/Formula/mariadb.rb15
1 files changed, 11 insertions, 4 deletions
diff --git a/Library/Formula/mariadb.rb b/Library/Formula/mariadb.rb
index ad6c5d058..ce8942564 100644
--- a/Library/Formula/mariadb.rb
+++ b/Library/Formula/mariadb.rb
@@ -3,12 +3,20 @@ 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.8/kvm-tarbake-jaunty-x86/mariadb-5.2.8.tar.gz'
+ url 'http://ftp.osuosl.org/pub/mariadb/mariadb-5.2.10/kvm-tarbake-jaunty-x86/mariadb-5.2.10.tar.gz'
homepage 'http://mariadb.org/'
- md5 '7b78be87df6a59ecd7a8c06a7e72eb83'
+ md5 'c47fa6448476b06bb15788d3f23e2ae8'
depends_on 'readline'
+ def patches
+ # upstream patches to fix compilation failures on OS X
+ # will be present in next release
+ { :p0 => ['http://bazaar.launchpad.net/~maria-captains/maria/5.2/diff/3085',
+ 'http://bazaar.launchpad.net/~maria-captains/maria/5.2/diff/3075.1.1',
+ 'http://bazaar.launchpad.net/~maria-captains/maria/5.2/diff/3094'] }
+ end
+
def options
[
['--with-tests', "Keep tests when installing."],
@@ -19,8 +27,7 @@ class Mariadb < Formula
end
def install
- ENV['CXXFLAGS'] = ENV['CXXFLAGS'].gsub "-fomit-frame-pointer", ""
- ENV['CXXFLAGS'] += " -O3 -fno-omit-frame-pointer -felide-constructors"
+ ENV.append 'CXXFLAGS', '-fno-omit-frame-pointer -felide-constructors'
# Make universal for bindings to universal applications
ENV.universal_binary if ARGV.build_universal?