mariadb 10.1.6 #42233
mariadb 10.1.6 #42233
Conversation
makigumo
commented
Jul 29, 2015
makigumo
commented
- move depends after options
- add patch for mroonga, fixing compilation (https://mariadb.atlassian.net/projects/MDEV/issues/MDEV-8551)
| @@ -80,6 +80,11 @@ def install | |||
| args << "-DPLUGIN_TOKUDB=NO" | |||
| end | |||
|
|
|||
| # disable Mroonga on 10.1 | |||
There was a problem hiding this comment.
Why does it need to be disabled?
(The conditional can also be made into a single line: args << "-DWITHOUT_MROONGA_STORAGE_ENGINE=1" if build.devel?)
There was a problem hiding this comment.
It fails with some messages like:
mariadb-10.1.6/storage/mroonga/vendor/groonga/lib/dat.cpp:191:3: error: cannot use 'try' with exceptions disabled
But I think I found a fix.
There was a problem hiding this comment.
But I think I found a fix.
Great! If it's something that can be reported upstream, it'd be great if you could do that too.
| depends_on "cmake" => :build | ||
| depends_on "pidof" unless MacOS.version >= :mountain_lion | ||
| depends_on "openssl" | ||
| patch :DATA |
There was a problem hiding this comment.
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!
There was a problem hiding this comment.
Done. I first wanted to see if it works on all platforms.
|
Thanks for the PR! 🎉 Pulled in 0006636. |
includes patch for mroonga compilation with clang++ Closes #42233. Signed-off-by: Tim D. Smith <git@tim-smith.us>
Added -fexceptions for CLang builds as per: Homebrew/legacy-homebrew#42233 combined with Homebrew/legacy-homebrew#43793 Tested by as ChasonTang per MariaDB#89
