Skip to content
This repository has been archived by the owner on Jul 4, 2023. It is now read-only.

mariadb 10.1.6 #42233

Closed
wants to merge 3 commits into from
Closed

mariadb 10.1.6 #42233

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
5ee2367
mariadb 10.1.6
makigumo Jul 29, 2015
ad54515
mariadb: patch for mroonga compilation with clang++
makigumo Jul 29, 2015
6fe222a
mariadb: add patch info
makigumo Jul 30, 2015
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
31 changes: 25 additions & 6 deletions Library/Formula/mariadb.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,14 +11,13 @@ class Mariadb < Formula
end

devel do
url "http://ftp.osuosl.org/pub/mariadb/mariadb-10.1.5/source/mariadb-10.1.5.tar.gz"
sha256 "af8788bfbb842338882e505612f86ef53a25968663a1519185ecf3de3b1efe83"
url "http://ftp.osuosl.org/pub/mariadb/mariadb-10.1.6/source/mariadb-10.1.6.tar.gz"
sha256 "492f28f0d7aee5bf0a0efd21c542ca4f291f349e66063695c5003df16e064959"
# fix compilation failure with clang in mroonga storage engine
# https://mariadb.atlassian.net/projects/MDEV/issues/MDEV-8551
patch :DATA
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Can you add a note on what this is doing & link to the bug report/upstream commit so we can track this as it progresses? Thanks!

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Done. I first wanted to see if it works on all platforms.

end

depends_on "cmake" => :build
depends_on "pidof" unless MacOS.version >= :mountain_lion
depends_on "openssl"

option :universal
option "with-tests", "Keep test when installing"
option "with-bench", "Keep benchmark app when installing"
Expand All @@ -30,6 +29,10 @@ class Mariadb < Formula

deprecated_option "enable-local-infile" => "with-local-infile"

depends_on "cmake" => :build
depends_on "pidof" unless MacOS.version >= :mountain_lion
depends_on "openssl"

conflicts_with "mysql", "mysql-cluster", "percona-server",
:because => "mariadb, mysql, and percona install the same binaries."
conflicts_with "mysql-connector-c",
Expand Down Expand Up @@ -218,3 +221,19 @@ def plist; <<-EOS.undent
end
end
end
__END__
diff --git a/storage/mroonga/vendor/groonga/CMakeLists.txt b/storage/mroonga/vendor/groonga/CMakeLists.txt
index ebe7f6b..609f77d 100644
--- a/storage/mroonga/vendor/groonga/CMakeLists.txt
+++ b/storage/mroonga/vendor/groonga/CMakeLists.txt
@@ -192,6 +192,10 @@ if(CMAKE_COMPILER_IS_GNUCXX)
check_build_flag("-Wno-clobbered")
endif()

+if(CMAKE_COMPILER_IS_CLANGCXX)
+ check_cxxflag("-fexceptions")
+endif()
+
if(NOT DEFINED CMAKE_C_COMPILE_OPTIONS_PIC)
# For old CMake
if(CMAKE_COMPILER_IS_GNUCXX OR CMAKE_COMPILER_IS_CLANGCXX)