Skip to content

Conversation

paveljanik
Copy link
Contributor

This solves bitcoin-core/leveldb-subtree#8

The file env_win.cc is included twice on Windows and once for all other systems. But it is not needed at all there.

This removes this warning on OS X:

/Applications/Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/bin/ranlib: file: leveldb/libleveldb.a(leveldb_libleveldb_a-env_win.o) has no symbols

@laanwj
Copy link
Member

laanwj commented Sep 28, 2016

utACK 7e5fd71

@theuni
Copy link
Member

theuni commented Sep 29, 2016

This currently matches the upstream behavior, though it's clearly not right.
utACK 7e5fd71

@laanwj
Copy link
Member

laanwj commented Sep 29, 2016

This currently matches the upstream behavior, though it's clearly not right.

That's our own fault, env_win.cc doesn't exist in the real upstream. It's a simplified windows platform created by me to work around windows-shutdown-during-sync issues in upstream. See bitcoin-core/leveldb-subtree#9 and #6917 .

@laanwj laanwj merged commit 7e5fd71 into bitcoin:master Sep 29, 2016
laanwj added a commit that referenced this pull request Sep 29, 2016
7e5fd71 Do not include env_win.cc on non-Windows systems (Pavel Janík)
codablock pushed a commit to codablock/dash that referenced this pull request Jan 12, 2018
7e5fd71 Do not include env_win.cc on non-Windows systems (Pavel Janík)
andvgal pushed a commit to energicryptocurrency/gen2-energi that referenced this pull request Jan 6, 2019
7e5fd71 Do not include env_win.cc on non-Windows systems (Pavel Janík)
zkbot added a commit to zcash/zcash that referenced this pull request Sep 25, 2020
Update LevelDB to upstream commit f545dfabf

Cherry-picked from the following upstream PRs:

- bitcoin/bitcoin#7911
- bitcoin/bitcoin#7982
- bitcoin/bitcoin#8133
- bitcoin/bitcoin#8784
  - Only the missing changes.
- bitcoin/bitcoin#8826
- bitcoin/bitcoin#8613
- bitcoin/bitcoin#10544
- bitcoin/bitcoin#10633
  - Only the changes to files and code we have.
- bitcoin/bitcoin#10806
- bitcoin/bitcoin#10958
- bitcoin/bitcoin#12451
- bitcoin/bitcoin#13925
- bitcoin/bitcoin#15270

This upgrades LevelDB in the exact same commit progression as upstream, up to January 2019.
@bitcoin bitcoin locked as resolved and limited conversation to collaborators Sep 8, 2021
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants