forked from monero-project/monero
-
Notifications
You must be signed in to change notification settings - Fork 42
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
Aeon upstream 8 #181
Merged
Merged
Aeon upstream 8 #181
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Depends cross compiles project dependencies for linux, mac and windows and multiple architectures. Depends is original work by Cory Fields and used in bitcoin and a wide range of bitcoin related projects.
Add readline, ldns, graphviz, unbound to depends packages Add a cmake toolchain file to depends that is uniquely created for every build and placed in triple/share/toolchain.cmake This file is then passed to cmake with -DCMAKE_TOOLCHAIN_FILE=/path/to/triple/share/toolchain.cmake Add the boost locale package to depends In the depends cmake toolchain file, a DEPENDS flag is added to exclude, or change cmake checks done that are required for depends Link miniupnpc and unwind from depends and not external Add libiconv and icu4c to depends, required for mingw32 builds. Headers (winsock) need to be lower case in order to compile on unix systems. This should not affect building on windows.
Add pcsc-lite to linux builds Fixup windows icu4c linking with depends, the static libraries have an 's' appended to them Compiling depends arm-linux-gnueabihf will allow you to compile armv6zk monero binaries
Explain the role of the SDK in the darwin build. Add instructions to compile depends to the basic readme.
Fix builds for native linux and windows The architecture flag was set incorrectly. It needs to be set only when compiling arm6.
Drop miniupnp and unbound depends builds. Make sure that build variables are propageted properly to unbound and miniupnp. Rebase to after the v0.12 release
This includes a minimal qt build without gui
…. /monero#3430 Fixup arm toolchain file.
icu tex support is not required, so just disable it. Re-add mistakingly removed crypt32 lib.
Set the architecture in the toolchain file correctly
- device name is a new wallet property - full device name is now a bit more structured so we can address particular device vendor + device path. Example: 'Ledger', 'Trezor:udp', 'Trezor:udp:127.0.0.1:21324', 'Trezor:bridge:usb01'. The part before ':' identifies HW device implementation, the optional part after ':' is device path to look for. - new --hw-device parameter added to the wallet, can name the hardware device - device reconnect added
stoffu
force-pushed
the
aeon-upstream-8
branch
2 times, most recently
from
June 12, 2020 08:03
9478b5c
to
c9067f8
Compare
Remove PCSC dependencies which is a bit hard (not user friendly) to install on linux and Mac Split Ledger logic and device IO
Add a Travis build script for Monero. This was blatantly copied from Bitcoin. It spawns jobs in docker containers running an ubuntu bionic image. This commit also a fixes a problem where librt was still linked, even when compiling statically.
Clang needs to get its cctools path passed.
Clang needs to get its cctools path passed directly for the hid build to succeed. Make gperf a permanent external dependency. Remove pcsc from depends.
The configure script in hidapi and libsodium tried to find clang in /usr/bin, even though the correct prefix was passed in. This sets the correct CC flag. This was previously undetected, because clang and the sdk where installed in the global environment. This also fixes a subsequent error, where IOKIT and CoreFoundation are not found, again for the reason stated above.
Add architecture flags when cmake invokes gcc manually. Add 32bit to Travis.
Depends can now be compiled with `make depends target=$triple`, where $triple is one of the supported build targets. Adapt the Makefile for this change, remove not needed windows deps from depends setup description.
Merged
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
This PR merges upstream PRs after monero-project#4347 which is the last one taken in the last upstream merge PR #180. The main purpose here is to merge monero-project#3430 which enables building with Bitcoin's depends. A few additional upstream PRs are also taken in order to make the build system work properly: