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

msvc: Fix silent merge conflict between #13926 and #14372 #15325

Merged
merged 1 commit into from Feb 4, 2019

Conversation

Projects
None yet
4 participants
@ken2812221
Copy link
Member

commented Feb 1, 2019

The bitcoin-wallet.exe would have to link with libsecp256k1 after we build libsecp256k1 in project.

@MarcoFalke MarcoFalke added this to the 0.18.0 milestone Feb 1, 2019

@MarcoFalke

This comment has been minimized.

Copy link
Member

commented Feb 1, 2019

@MarcoFalke MarcoFalke added the Windows label Feb 1, 2019

@MarcoFalke

This comment has been minimized.

Copy link
Member

commented Feb 3, 2019

@NicolasDorier

This comment has been minimized.

Copy link
Member

commented Feb 3, 2019

tACK

@ken2812221

This comment has been minimized.

Copy link
Member Author

commented Feb 3, 2019

@MarcoFalke I think that MSVC is trying to link with vcpkg's secp256k1 library that is in the cache.

error if we clear the cache: https://ci.appveyor.com/project/ken2812221/bitcoin/builds/22067759

@sipsorcery

This comment has been minimized.

Copy link
Contributor

commented Feb 3, 2019

tACK bef8fdd.

MarcoFalke added a commit to MarcoFalke/bitcoin that referenced this pull request Feb 4, 2019

Merge bitcoin#15325: msvc: Fix silent merge conflict between bitcoin#…
…13926 and bitcoin#14372

bef8fdd msvc: Fix silent merge conflict between bitcoin#13926 and bitcoin#14372 (ken2812221)

Pull request description:

  The bitcoin-wallet.exe would have to link with libsecp256k1 after we build libsecp256k1 in project.

Tree-SHA512: cb3fafa301f39121f5d26ac8ac6009c9665fcad1061dbf14ba013104870abe5413ac57c97c97df12b6ba2ad709b776c51aeec20d41f3ae01d3460a5e18f40eec

@MarcoFalke MarcoFalke merged commit bef8fdd into bitcoin:master Feb 4, 2019

2 checks passed

continuous-integration/appveyor/pr AppVeyor build succeeded
Details
continuous-integration/travis-ci/pr The Travis CI build passed
Details

@ken2812221 ken2812221 deleted the ken2812221:msvc-merge-conflict branch Feb 4, 2019

MarcoFalke added a commit that referenced this pull request Feb 14, 2019

Merge #15407: msvc: Fix silent merge conflict between #13926 and #14372
… part II

3c6ef03 msvc: Fix silent merge conflict between #13926 and #14372 part II (Chun Kuan Lee)

Pull request description:

  In #15325, I added secp256k1 as a dependency of bitcoin-wallet. However, I didn't notice that leveldb is also a dependency of it.

Tree-SHA512: dc29b5cad6c529dd9517d6c2cbbe5297b69e73303e2fbbcd4b4842c9c5b51a4332df5a4bf3b82cd3ed2c1668cc95f8c9636f9485af0d722fed9c1319da3cc2e2
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
You can’t perform that action at this time.