-
-
Notifications
You must be signed in to change notification settings - Fork 11.4k
Fix the --include-related option for 10.9 #37020
Conversation
@@ -43,6 +43,10 @@ def install | |||
# shipped by default with Mac OS X is too old. | |||
ENV["EMACS"] = "no" if build.without? "emacs" | |||
|
|||
# Make --related work on 10.9 | |||
# https://github.com/djcb/mu/issues/380 | |||
ENV.append 'CXXFLAGS', '-std=c++11' |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
What about 10.8?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
It works on 10.8, and I believe will continue working.
The line can be wrapped in if version >= 10.9
- I'm not finding what that line will look like in brew.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
10.8 doesn't ship with a libc++. If this needs C++11 instead use ENV.cxx11
and/or needs :cxx11
. Thanks!
Updated pull request. Thanks @MikeMcQuaid for the hint, I found the guard I wanted. This will now continue to work for 10.8. And finally >= 10.9 will actually work. |
Does using a different optimization level work, per djcb/mu#380 (comment)? That sounds like a more parsimonious solution. You can add |
@tdsmith ENV.O0 does the trick. This exercise also gave me a good excuse to add a decent brew test in there. |
This used to happen outdoors. It was more fun then. | ||
EOS | ||
|
||
system "#{bin}/mu index --muhome #{testpath} --maildir=#{testpath}" |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Split the system
arguments "like", "this"
@MikeMcQuaid thank you for the style check :-) |
find_message_and_related = "#{mu_find} --include-related msgid:2222222222@example.com" | ||
|
||
assert_equal 1, shell_output(find_message).lines.size | ||
assert_equal 2, shell_output(find_message_and_related).lines.size, |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Sorry, my bad, .size
should be .count
for Ruby 1.8 on OS X 10.8.
1a6c7ca
to
a08835c
Compare
- Compile with -O0 on >= mavericks - Add a test for mu - djcb/mu#380
djcb/mu#332 is the same root cause as djcb/mu#380 which is fixed by Homebrew#37020
djcb/mu#332 is the same root cause as djcb/mu#380 which is fixed by Homebrew#37020
djcb/mu#332 is the same root cause as djcb/mu#380 which is fixed by Homebrew#37020
@MikeMcQuaid this PR is done done now. |
@danieroux Thanks for your contribution to Homebrew! Without people like you submitting PRs we couldn't run this project. You rock! For future reference the preferred commit message format is |
CXXFLAGS='-std=c++11' need to be set for xapian to be happy, it seems.
Fix from: djcb/mu#380