summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLuke Dashjr <luke-jr+git@utopios.org>2021-11-06 16:54:29 +0000
committerJoonas Niilola <juippis@gentoo.org>2021-11-18 08:52:26 +0200
commit504ca74263eeb38b59de2db4bd5f2d3114ff7281 (patch)
treee28de4ff57a12b80cfe7ff8350f44281bedee34f /net-p2p/bitcoind
parentnet-p2p/bitcoin-qt: Add patch for boost 1.77 compatibility (diff)
downloadgentoo-504ca74263eeb38b59de2db4bd5f2d3114ff7281.tar.gz
gentoo-504ca74263eeb38b59de2db4bd5f2d3114ff7281.tar.bz2
gentoo-504ca74263eeb38b59de2db4bd5f2d3114ff7281.zip
net-p2p/bitcoind: Add patch for boost 1.77 compatibility
Closes: https://bugs.gentoo.org/816885 Signed-off-by: Luke Dashjr <luke-jr+git@utopios.org> Closes: https://github.com/gentoo/gentoo/pull/22849 Signed-off-by: Joonas Niilola <juippis@gentoo.org>
Diffstat (limited to 'net-p2p/bitcoind')
-rw-r--r--net-p2p/bitcoind/bitcoind-0.20.1.ebuild2
-rw-r--r--net-p2p/bitcoind/bitcoind-0.21.0.ebuild2
-rw-r--r--net-p2p/bitcoind/bitcoind-0.21.1.ebuild2
-rw-r--r--net-p2p/bitcoind/files/bitcoind-0.20.1-boost-1.77-compat.patch56
4 files changed, 62 insertions, 0 deletions
diff --git a/net-p2p/bitcoind/bitcoind-0.20.1.ebuild b/net-p2p/bitcoind/bitcoind-0.20.1.ebuild
index a5b951f9c8b7..0bbc6f4b723a 100644
--- a/net-p2p/bitcoind/bitcoind-0.20.1.ebuild
+++ b/net-p2p/bitcoind/bitcoind-0.20.1.ebuild
@@ -84,6 +84,8 @@ src_prepare() {
eapply "${knots_patchdir}/${KNOTS_P}.ts.patch"
fi
+ eapply "${FILESDIR}/${P}-boost-1.77-compat.patch"
+
default
echo '#!/bin/true' >share/genbuild.sh || die
diff --git a/net-p2p/bitcoind/bitcoind-0.21.0.ebuild b/net-p2p/bitcoind/bitcoind-0.21.0.ebuild
index 4db4a7535311..574db30d89bb 100644
--- a/net-p2p/bitcoind/bitcoind-0.21.0.ebuild
+++ b/net-p2p/bitcoind/bitcoind-0.21.0.ebuild
@@ -85,6 +85,8 @@ src_prepare() {
eapply "${knots_patchdir}/${KNOTS_P}.ts.patch"
fi
+ eapply "${FILESDIR}/${PN}-0.20.1-boost-1.77-compat.patch"
+
default
echo '#!/bin/true' >share/genbuild.sh || die
diff --git a/net-p2p/bitcoind/bitcoind-0.21.1.ebuild b/net-p2p/bitcoind/bitcoind-0.21.1.ebuild
index fc4654fa3b96..2c57f6b16617 100644
--- a/net-p2p/bitcoind/bitcoind-0.21.1.ebuild
+++ b/net-p2p/bitcoind/bitcoind-0.21.1.ebuild
@@ -101,6 +101,8 @@ src_prepare() {
eapply "${knots_patchdir}/${KNOTS_P}.ts.patch"
fi
+ eapply "${FILESDIR}/${PN}-0.20.1-boost-1.77-compat.patch"
+
default
echo '#!/bin/true' >share/genbuild.sh || die
diff --git a/net-p2p/bitcoind/files/bitcoind-0.20.1-boost-1.77-compat.patch b/net-p2p/bitcoind/files/bitcoind-0.20.1-boost-1.77-compat.patch
new file mode 100644
index 000000000000..53b5563cb662
--- /dev/null
+++ b/net-p2p/bitcoind/files/bitcoind-0.20.1-boost-1.77-compat.patch
@@ -0,0 +1,56 @@
+commit acb7aad27ec8a184808aa7905887e3b2c5d54e9c
+Author: Rafael Sadowski <rafael@sizeofvoid.org>
+Date: Mon Aug 16 06:34:02 2021 +0200
+
+ Fix build with Boost 1.77.0
+
+ BOOST_FILESYSTEM_C_STR changed to accept the path as an argument
+
+diff --git a/src/fs.cpp b/src/fs.cpp
+index 4f20ca4d28f..89c7ad27dc4 100644
+--- a/src/fs.cpp
++++ b/src/fs.cpp
+@@ -242,7 +242,11 @@ void ofstream::close()
+ }
+ #else // __GLIBCXX__
+
++#if BOOST_VERSION >= 107700
++static_assert(sizeof(*BOOST_FILESYSTEM_C_STR(fs::path())) == sizeof(wchar_t),
++#else
+ static_assert(sizeof(*fs::path().BOOST_FILESYSTEM_C_STR) == sizeof(wchar_t),
++#endif // BOOST_VERSION >= 107700
+ "Warning: This build is using boost::filesystem ofstream and ifstream "
+ "implementations which will fail to open paths containing multibyte "
+ "characters. You should delete this static_assert to ignore this warning, "
+diff --git a/src/wallet/test/db_tests.cpp b/src/wallet/test/db_tests.cpp
+index 17f5264b459..16cb7e0baf0 100644
+--- a/src/wallet/test/db_tests.cpp
++++ b/src/wallet/test/db_tests.cpp
+@@ -25,7 +25,11 @@ BOOST_AUTO_TEST_CASE(getwalletenv_file)
+ std::string test_name = "test_name.dat";
+ const fs::path datadir = gArgs.GetDataDirNet();
+ fs::path file_path = datadir / test_name;
++#if BOOST_VERSION >= 107700
++ std::ofstream f(BOOST_FILESYSTEM_C_STR(file_path));
++#else
+ std::ofstream f(file_path.BOOST_FILESYSTEM_C_STR);
++#endif // BOOST_VERSION >= 107700
+ f.close();
+
+ std::string filename;
+diff --git a/src/wallet/test/init_test_fixture.cpp b/src/wallet/test/init_test_fixture.cpp
+index dd9354848d7..53c972c46d3 100644
+--- a/src/wallet/test/init_test_fixture.cpp
++++ b/src/wallet/test/init_test_fixture.cpp
+@@ -32,7 +32,11 @@ InitWalletDirTestingSetup::InitWalletDirTestingSetup(const std::string& chainNam
+ fs::create_directories(m_walletdir_path_cases["default"]);
+ fs::create_directories(m_walletdir_path_cases["custom"]);
+ fs::create_directories(m_walletdir_path_cases["relative"]);
++#if BOOST_VERSION >= 107700
++ std::ofstream f(BOOST_FILESYSTEM_C_STR(m_walletdir_path_cases["file"]));
++#else
+ std::ofstream f(m_walletdir_path_cases["file"].BOOST_FILESYSTEM_C_STR);
++#endif // BOOST_VERSION >= 107700
+ f.close();
+ }
+