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

Build-related upstream patches 1 #88

Merged
merged 51 commits into from Dec 20, 2018
Merged

Conversation

stoffu
Copy link

@stoffu stoffu commented Dec 17, 2018

The idea of this PR is to pull all the build-related upstream patches up to the latest commit so that all the upstream fixes for build issues can be reflected in a timely manner. This PR includes the following upstream PRs:

Note that this PR skips several important patches that make significant changes to the codebase, specifically:

These patches will be merged later along with the rest of the codebase being updated in order. Because of this circumstance, some upstream patches taken in this PR needed conflict resolution.

EDIT:
Added monero-project#4074 in order to circumvent a build halt caused by -Werror.

stoffu and others added 30 commits December 17, 2018 13:00
Let it be autodiscovered instead to avoid cmake thinking it's crosscompiling builds where host = target. This resolves a cmake configure error in MSYS2 caused by CMAKE_CROSSCOMPILING checks in monero-project#4294.
This proposal allows to perform multiple compilation from different branch/arch in
separate directories.
Example:

    build
    ├── GNU_Linux
    │   ├── multi-compilation
    │   │   └── release
    │   └── NanoS-USBHID
    │       └── release
    └── Msys
        └── NanoS-USBHID
            └── release

Edit 1:

Try to handle special char as : / \ .

--data-dir in unit test not yet tested

Edit 2:

donot use param for uname. -o is not supported by MacOS.
Rebased by moneromooo, with a sensible commit message
Adds CMake check that pulls from the different git remotes and checks if
there is any output.
glemercier and others added 20 commits December 17, 2018 16:24
The Docker image is failing to build, as the submodules are not being
explicitly initialized and updated.

Fixes: monero-project#4582

Signed-off-by: Tyler Baker <tyler@foundries.io>
The cmake thread detection just ain't enough to always work
Increased swap size on raspberry pi compiling guide, since it might crash if the raspberry has any service runing in the background
@BigslimVdub
Copy link

builds for andriod on linux & docker now

@aeonix aeonix merged commit 72568f6 into aeonix:master Dec 20, 2018
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.

None yet