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

4 files changed, 53 insertions, 0 deletions

diff --git a/net-p2p/monero-cli/files/patch-src_blockchain__utilities_blockchain__blackball.cpp b/net-p2p/monero-cli/files/patch-src_blockchain__utilities_blockchain__blackball.cpp
new file mode 100644
index 000000000000..864e9d6d4b1d
--- /dev/null
+++ b/net-p2p/monero-cli/files/patch-src_blockchain__utilities_blockchain__blackball.cpp
@@ -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])
diff --git a/net-p2p/monero-cli/files/patch-src_cryptonote__core_cryptonote__core.cpp b/net-p2p/monero-cli/files/patch-src_cryptonote__core_cryptonote__core.cpp
new file mode 100644
index 000000000000..fe8b9be66803
--- /dev/null
+++ b/net-p2p/monero-cli/files/patch-src_cryptonote__core_cryptonote__core.cpp
@@ -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])
diff --git a/net-p2p/monero-cli/files/patch-src_daemon_command__line__args.h b/net-p2p/monero-cli/files/patch-src_daemon_command__line__args.h
new file mode 100644
index 000000000000..a8ebeba2750c
--- /dev/null
+++ b/net-p2p/monero-cli/files/patch-src_daemon_command__line__args.h
@@ -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();
diff --git a/net-p2p/monero-cli/files/patch-src_wallet_wallet2.cpp b/net-p2p/monero-cli/files/patch-src_wallet_wallet2.cpp
new file mode 100644
index 000000000000..046b37edfbd1
--- /dev/null
+++ b/net-p2p/monero-cli/files/patch-src_wallet_wallet2.cpp
@@ -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;