Skip to content
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

Depends fixes #990

Merged
merged 12 commits into from
Dec 24, 2019
Merged

Depends fixes #990

merged 12 commits into from
Dec 24, 2019

Conversation

jagerman
Copy link
Member

@jagerman jagerman commented Dec 23, 2019

Cherry-picks various contrib/depends commits from Monero + adds some workarounds to get static builds of 6.1.0 working for Linux & macOS working via contrib/depends.

TheCharlatan and others added 12 commits December 22, 2019 22:24
Following 13c0b8c, the unwind package is being attempted to be built on
Windows and Mac when it should only be built on Linux.
Needed to invoke deterministic mode on some archivers
get rid of sodium-darwin.mk special case, unify back with sodium.mk
Sort objects being archived
By omitting the otool binary which is built non-deterministically.
We don't use it anyway.
The MacOSX 10.11 SDK we use is broken AF: it lies about supporting
C++14, but really only upgraded the headers but not the library itself,
so using std::shared_timed_mutex just results in a linking failure.

Upgrading the SDK is a huge pain (I tried, failed, and gave up), so for
now temporarily switch to boost::shared_mutex until we sort out the
macOS build disaster.
@jagerman jagerman merged commit 9bd15fe into oxen-io:dev Dec 24, 2019
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants