cpet/freebsd-ports
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

MFH: r467214

Browse Source 
net-p2p/monero-cli: Fix build on FreeBSD10/clang34

Approved by:	portmgr (blanket approval for fixing a broken build)
This commit is contained in:
Vasil Dimov 2018-04-19 16:22:02 +00:00
parent 67778dc621
commit de117dcaa1
Notes: svn2git 2021-03-31 03:12:20 +00:00 
svn path=/branches/2018Q2/; revision=467781
4 changed files with 53 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
net-p2p/monero-cli/files/patch-src_blockchain__utilities_blockchain__blackball.cpp Normal file
View File

@ -0,0 +1,11 @@
--- src/blockchain_utilities/blockchain_blackball.cpp.orig 2018-04-12 18:35:24 UTC
+++ src/blockchain_utilities/blockchain_blackball.cpp
@@ -165,7 +165,7 @@ int main(int argc, char* argv[])
"blackball-db-dir", "Specify blackball database directory",
get_default_db_path(),
{{ &arg_testnet_on, &arg_stagenet_on }},
- [](std::array<bool, 2> testnet_stagenet, bool defaulted, std::string val) {
+ [](std::array<bool, 2> testnet_stagenet, bool defaulted, std::string val) -> std::string {
if (testnet_stagenet[0])
return (boost::filesystem::path(val) / "testnet").string();
else if (testnet_stagenet[1])

11
net-p2p/monero-cli/files/patch-src_cryptonote__core_cryptonote__core.cpp Normal file
View File

@ -0,0 +1,11 @@
--- src/cryptonote_core/cryptonote_core.cpp.orig 2018-04-12 18:30:36 UTC
+++ src/cryptonote_core/cryptonote_core.cpp
@@ -81,7 +81,7 @@ namespace cryptonote
, "Specify data directory"
, tools::get_default_data_dir()
, {{ &arg_testnet_on, &arg_stagenet_on }}
- , [](std::array<bool, 2> testnet_stagenet, bool defaulted, std::string val) {
+ , [](std::array<bool, 2> testnet_stagenet, bool defaulted, std::string val) -> std::string {
if (testnet_stagenet[0])
return (boost::filesystem::path(val) / "testnet").string();
else if (testnet_stagenet[1])

20
net-p2p/monero-cli/files/patch-src_daemon_command__line__args.h Normal file
View File

@ -0,0 +1,20 @@
--- src/daemon/command_line_args.h.orig 2018-04-12 18:39:37 UTC
+++ src/daemon/command_line_args.h
@@ -42,7 +42,7 @@ namespace daemon_args
, "Specify configuration file"
, (daemonizer::get_default_data_dir() / std::string(CRYPTONOTE_NAME ".conf")).string()
, {{ &cryptonote::arg_testnet_on, &cryptonote::arg_stagenet_on }}
- , [](std::array<bool, 2> testnet_stagenet, bool defaulted, std::string val) {
+ , [](std::array<bool, 2> testnet_stagenet, bool defaulted, std::string val) -> std::string {
if (testnet_stagenet[0] && defaulted)
return (daemonizer::get_default_data_dir() / "testnet" /
std::string(CRYPTONOTE_NAME ".conf")).string();
@@ -57,7 +57,7 @@ namespace daemon_args
, "Specify log file"
, (daemonizer::get_default_data_dir() / std::string(CRYPTONOTE_NAME ".log")).string()
, {{ &cryptonote::arg_testnet_on, &cryptonote::arg_stagenet_on }}
- , [](std::array<bool, 2> testnet_stagenet, bool defaulted, std::string val) {
+ , [](std::array<bool, 2> testnet_stagenet, bool defaulted, std::string val) -> std::string {
if (testnet_stagenet[0] && defaulted)
return (daemonizer::get_default_data_dir() / "testnet" /
std::string(CRYPTONOTE_NAME ".log")).string();

11
net-p2p/monero-cli/files/patch-src_wallet_wallet2.cpp Normal file
View File

@ -0,0 +1,11 @@
--- src/wallet/wallet2.cpp.orig 2018-03-24 15:56:14 UTC
+++ src/wallet/wallet2.cpp
@@ -145,7 +145,7 @@ struct options {
"shared-ringdb-dir", tools::wallet2::tr("Set shared ring database path"),
get_default_ringdb_path(),
testnet,
- [](bool testnet, bool defaulted, std::string val) {
+ [](bool testnet, bool defaulted, std::string val) -> std::string {
if (testnet)
return (boost::filesystem::path(val) / "testnet").string();
return val;