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

Unbreak build with Boost 1.72.0 #17654

Merged
merged 1 commit into from Dec 13, 2019
Merged

Unbreak build with Boost 1.72.0 #17654

merged 1 commit into from Dec 13, 2019

Conversation

@jbeich
Copy link
Contributor

jbeich commented Dec 2, 2019

Regressed by boostorg/filesystem@9a14c37. See error log.

#define BOOST_FILESYSTEM_NO_DEPRECATED

@fanquake fanquake added the Wallet label Dec 2, 2019
@laanwj

This comment has been minimized.

Copy link
Member

laanwj commented Dec 3, 2019

ACK 90916dd

@laanwj

This comment has been minimized.

Copy link
Member

laanwj commented Dec 3, 2019

Note that boost 1.72 is not released yet: the site shows it in progress https://www.boost.org/users/history/in_progress.html

Can we be sure this doesn't get corrected before the release? Might make sense to wait for that.

@jbeich

This comment has been minimized.

Copy link
Contributor Author

jbeich commented Dec 11, 2019

Boost 1.72 is released and landed in FreeBSD Ports. The fix here is still required.

@MarcoFalke

This comment has been minimized.

Copy link
Member

MarcoFalke commented Dec 11, 2019

We should probably just remove BOOST_FILESYSTEM_NO_DEPRECATED again. The minimum version of boost is not going to be bumped ever again, because we will be removing boost before that happens. And until that happens, we actually want to use the deprecated features.

wallet/walletutil.cpp:77:23: error: no member named 'level' in 'boost::filesystem::recursive_directory_iterator'
        } else if (it.level() == 0 && it->symlink_status().type() == fs::regular_file && IsBerkeleyBtree(it...
                   ~~ ^
@jbeich

This comment has been minimized.

Copy link
Contributor Author

jbeich commented Dec 11, 2019

remove BOOST_FILESYSTEM_NO_DEPRECATED

Works for me.

@MarcoFalke

This comment has been minimized.

Copy link
Member

MarcoFalke commented Dec 11, 2019

ACK a64e97d

@MarcoFalke MarcoFalke added this to the 0.19.1 milestone Dec 11, 2019
@fanquake fanquake added Utils/log/libs and removed Wallet labels Dec 11, 2019
laanwj added a commit that referenced this pull request Dec 13, 2019
a64e97d wallet: unbreak with boost 1.72 (Jan Beich)

Pull request description:

  Regressed by boostorg/filesystem@9a14c37. See [error log](http://package22.nyi.freebsd.org/data/113amd64-default-PR241449/2019-11-27_11h48m22s/logs/bitcoin-0.19.0.1.log).
  https://github.com/bitcoin/bitcoin/blob/35eda631ed3bd23d4a41761a85a96f925d4a6337/src/fs.h#L14

ACKs for top commit:
  MarcoFalke:
    ACK a64e97d

Tree-SHA512: 0aad2b8ec211bb81021a2f8cd2059364f949be716ebaf154dd97d5c2f7119f42553892e90e6c375018ff2155b996690c7520374762259778de88014cb531ad3b
@laanwj laanwj merged commit a64e97d into bitcoin:master Dec 13, 2019
2 checks passed
2 checks passed
continuous-integration/appveyor/pr AppVeyor build succeeded
Details
continuous-integration/travis-ci/pr The Travis CI build passed
Details
sidhujag added a commit to syscoin/syscoin that referenced this pull request Dec 13, 2019
a64e97d wallet: unbreak with boost 1.72 (Jan Beich)

Pull request description:

  Regressed by boostorg/filesystem@9a14c37. See [error log](http://package22.nyi.freebsd.org/data/113amd64-default-PR241449/2019-11-27_11h48m22s/logs/bitcoin-0.19.0.1.log).
  https://github.com/bitcoin/bitcoin/blob/35eda631ed3bd23d4a41761a85a96f925d4a6337/src/fs.h#L14

ACKs for top commit:
  MarcoFalke:
    ACK a64e97d

Tree-SHA512: 0aad2b8ec211bb81021a2f8cd2059364f949be716ebaf154dd97d5c2f7119f42553892e90e6c375018ff2155b996690c7520374762259778de88014cb531ad3b
@scpeters scpeters mentioned this pull request Dec 27, 2019
fanquake added a commit to fanquake/bitcoin that referenced this pull request Jan 3, 2020
wallet/walletutil.cpp:77:23: error: no member named 'level' in 'boost::filesystem::recursive_directory_iterator'
        } else if (it.level() == 0 && it->symlink_status().type() == fs::regular_file && IsBerkeleyBtree(it...
                   ~~ ^

Github-Pull: bitcoin#17654
Rebased-From: a64e97d
This was referenced Jan 3, 2020
luke-jr added a commit to bitcoinknots/bitcoin that referenced this pull request Jan 5, 2020
wallet/walletutil.cpp:77:23: error: no member named 'level' in 'boost::filesystem::recursive_directory_iterator'
        } else if (it.level() == 0 && it->symlink_status().type() == fs::regular_file && IsBerkeleyBtree(it...
                   ~~ ^

Github-Pull: bitcoin#17654
Rebased-From: a64e97d
@fanquake

This comment has been minimized.

Copy link
Member

fanquake commented Jan 5, 2020

Being backported in 17858.

laanwj added a commit that referenced this pull request Jan 8, 2020
99b5407 scripts: fix check-symbols & check-security argument passing (fanquake)
4330a1e Update msvc build for Visual Studio 2019 v16.4 (Aaron Clauson)
b0f9b8e Moves vcpkg list to a text file and updates the appveyor job and readme to use it. (Aaron Clauson)
cd7b3b2 Updated appveyor config:  - Update build image from Visual Studio 2017 to Visual Studio 2019.  - Updated Qt static library from Qt5.9.7 to Qt5.9.8.  - Added commands to update vcpkg port files (this does not update already installed packages).  - Updated vcpkg package list as per #17309.  - Removed commands setting common project file options. Now done via common.init.vcxproj include.  - Changed msbuild verbosity from normal to quiet. Normal rights a LOT of logs and impacts appveyor job duration. Updated msvc project configs:  - Updated platform toolset from v141 to v142.  - Updated Qt static library from Qt5.9.7 to Qt5.9.8.  - Added ignore for linker warning building bitcoin-qt program.  - Added missing util/str.cpp class file to test_bitcoin project file. (Aaron Clauson)
112144d Add missing typeinfo includes (Wladimir J. van der Laan)
1a6a534 net: Log to net category for exceptions in ProcessMessages (Wladimir J. van der Laan)
c0dc728 test: fix bitcoind already running warnings on macOS (fanquake)
5276b0e util: Add missing headers to util/fees.cpp (Hennadii Stepanov)
4d7875c rpc: require second argument only for scantxoutset start action (Andrew Chow)
bda2f5b cli: fix Fatal LevelDB error when specifying -blockfilterindex=basic twice (Harris)
d14ab7c gui: disable File->CreateWallet during startup (fanquake)
b9f1bc0 wallet: unbreak with boost 1.72 (Jan Beich)

Pull request description:

  Backports the following PRs to the 0.19 branch:
  * #17654 - Unbreak build with Boost 1.72.0
  * #17695 - gui: disable File->CreateWallet during startup
  * #17687 - cli: fix Fatal LevelDB error when specifying -blockfilterindex=basic twice
  * #17728 - rpc: require second argument only for scantxoutset start action
  * #17450 - util: Add missing headers to util/fees.cpp
  * #17488 - test: fix "bitcoind already running" warnings on macOS
  * #17762 - Log to net category for exceptions in ProcessMessages
  * #17364 - Updates to appveyor config for VS2019 and Qt5.9.8 + msvc project fixes
  * #17416 - Appveyor improvement - text file for vcpkg package list
  * #17736 - Update msvc build for Visual Studio 2019 v16.4
  * #17857 - scripts: fix symbol-check & security-check argument passing

  Fixes #17856.

ACKs for top commit:
  sipsorcery:
    ACK (tested: Windows 10 & msvc build) 99b5407.

Tree-SHA512: 91313de56fb0825e70a4be30ba0bf561b8c26d7dcf60549185df4f5e3524099398c828bb46faae807b631634d1afd5a1d397fb41e61ecfa0d746e4bf10b923cb
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Linked issues

Successfully merging this pull request may close these issues.

None yet

4 participants
You can’t perform that action at this time.