-
Notifications
You must be signed in to change notification settings - Fork 2.2k
Darwin build fixes #2697
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Darwin build fixes #2697
Conversation
|
I have been manually testing this branch on the macos-0 CI worker, to bypass the (in this branch) non-working |
|
Removing the WIP label because we could merge this as-is. It doesn't get MacOS compiling, but it makes significant headway (e.g. libsnark compiles with clang). |
|
I don't understand the
Specifically I don't see how this guarantees to catch the incorrect behaviour of retaking a lock while its reverse-lock is held. The upstream commit is unenlightening. |
|
Re: e430b42 , we use a different version of BDB than upstream, so I can't tell whether this patch will apply correctly or is still needed. |
daira
left a comment
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.
Otherwise ACK. (I smoke-tested that this branch still builds and runs on my Debian VM.)
What I can't figure out is why this would even result in catching undefined behaviour. AFAICT, if the parent calls Regardless, IMHO this approach is better than our version of the bugfix in 108650a (which just disables
We are? f79ccfbe700465f61e195ea87ec3c7e1b23ebf7c alters
I altered this commit to apply to our BDB version. This bug is still present in BDB 6.2.23; item 7 of the BDB 6.2.32 changelog suggests the problem has been fixed there. |
|
The reverse lock is only used in With regards to the change to I haven't been able to test this on a Mac so can't comment on whether or not all the build changes achieve their goal or not. |
If we did rewrite it, that would be for another PR, and should probably also be done after we pull in upstream's changes to it (for compatibility with other upstream PRs).
The rest of the commit message reads:
Thus it is necessary for building on at least MacOS 10.12, which requires using libc++ for C++11. |
bitcartel
left a comment
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.
utACK
|
This has sufficient ACKs, but I have bumped it to 1.0.14 because it depends on #2696 (otherwise we won't be able to see any effect of this PR), which still needs some work. |
|
☔ The latest upstream changes (presumably #2739) made this pull request unmergeable. Please resolve the merge conflicts. |
|
Rebased on master to fix merge conflict. |
|
This is blocked by the Gitian build failure at #2696 (comment) . |
|
Rebased on master to fix merge conflicts. |
|
⌛ Trying commit c6b39fb with merge 33f7145fb216dbe18d7a424fbb91da9fc2685e61... |
|
💔 Test failed - pr-try |
|
Updated workers to all have curl. @zkbot retry |
Darwin build fixes Includes fixes cherry-picked from the following upstream PRs: - bitcoin/bitcoin#7136 - Only the third commit (to avoid a merge conflict) - bitcoin/bitcoin#7302 - Excluding the first commit, which is unnecessary (we use Boost 1.62) - bitcoin/bitcoin#7487 - bitcoin/bitcoin#7606 - bitcoin/bitcoin#7711 - bitcoin/bitcoin#7165 - bitcoin/bitcoin#8002 - bitcoin/bitcoin#8210 - Only the second commit - bitcoin/bitcoin#9114
|
☀️ Test successful - pr-try |
|
Per the above test, this PR enables all currently-enabled dependencies to build on MacOS (before, after). It also makes changes that improve later parts of the build system, but that are not visible because they require changes to @zkbot r+ |
|
📌 Commit c6b39fb has been approved by |
Darwin build fixes Includes fixes cherry-picked from the following upstream PRs: - bitcoin/bitcoin#7136 - Only the third commit (to avoid a merge conflict) - bitcoin/bitcoin#7302 - Excluding the first commit, which is unnecessary (we use Boost 1.62) - bitcoin/bitcoin#7487 - bitcoin/bitcoin#7606 - bitcoin/bitcoin#7711 - bitcoin/bitcoin#7165 - bitcoin/bitcoin#8002 - bitcoin/bitcoin#8210 - Only the second commit - bitcoin/bitcoin#9114
|
💔 Test failed - pr-merge |
|
Timeout in @zkbot retry |
Darwin build fixes Includes fixes cherry-picked from the following upstream PRs: - bitcoin/bitcoin#7136 - Only the third commit (to avoid a merge conflict) - bitcoin/bitcoin#7302 - Excluding the first commit, which is unnecessary (we use Boost 1.62) - bitcoin/bitcoin#7487 - bitcoin/bitcoin#7606 - bitcoin/bitcoin#7711 - bitcoin/bitcoin#7165 - bitcoin/bitcoin#8002 - bitcoin/bitcoin#8210 - Only the second commit - bitcoin/bitcoin#9114
clang: 3.7.1 cctools: 877.8 ld64: 253.9 Zcash: Second part of f25209a from upstream (we merged the first part in zcash#2697).
clang: 3.7.1 cctools: 877.8 ld64: 253.9 Zcash: Second part of f25209a from upstream (we merged the first part in zcash#2697).
Includes fixes cherry-picked from the following upstream PRs: