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

Fix the --include-related option for 10.9 #37020

Closed
wants to merge 2 commits into from

Conversation

danieroux
Copy link
Contributor

CXXFLAGS='-std=c++11' need to be set for xapian to be happy, it seems.

Fix from: djcb/mu#380

@@ -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'
Copy link
Member

Choose a reason for hiding this comment

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

What about 10.8?

Copy link
Contributor Author

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.

Copy link
Member

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!

@danieroux
Copy link
Contributor Author

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.

@tdsmith
Copy link
Contributor

tdsmith commented Feb 21, 2015

Does using a different optimization level work, per djcb/mu#380 (comment)? That sounds like a more parsimonious solution. You can add ENV.O2 to the top of install to check.

@danieroux
Copy link
Contributor Author

@tdsmith ENV.O0 does the trick. This exercise also gave me a good excuse to add a decent brew test in there.

@danieroux danieroux mentioned this pull request Feb 22, 2015
This used to happen outdoors. It was more fun then.
EOS

system "#{bin}/mu index --muhome #{testpath} --maildir=#{testpath}"
Copy link
Member

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"

@danieroux
Copy link
Contributor Author

@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,
Copy link
Member

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.

@danieroux danieroux changed the title Fix the --related option for 10.9 Fix the --with-related option for 10.9 Feb 24, 2015
@danieroux danieroux changed the title Fix the --with-related option for 10.9 Fix the --include-related option for 10.9 Feb 24, 2015
- Compile with -O0 on >= mavericks
- Add a test for mu
- djcb/mu#380
danieroux added a commit to danieroux/homebrew that referenced this pull request Feb 26, 2015
danieroux added a commit to danieroux/homebrew that referenced this pull request Feb 28, 2015
@danieroux
Copy link
Contributor Author

@MikeMcQuaid this PR is done done now.

@MikeMcQuaid
Copy link
Member

@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 mu: fix --include-related option for 10.9.

@Homebrew Homebrew locked and limited conversation to collaborators Jul 10, 2016
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants