zecfoundation
/
zcashd
mirror of https://github.com/ZcashFoundation/zcashd.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

depends: Fix boost::iostreams usage on Windows with libc++ 

Fixed upstream (but not yet in a Boost release):
    https://github.com/boostorg/iostreams/pull/106
This commit is contained in:
Jack Grigg 2020-10-13 16:33:25 +01:00
parent c691a8413f
commit ab4033c49c
2 changed files with 27 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
depends/packages/boost.mk
View File

@ -3,7 +3,7 @@ $(package)_version=1_74_0
$(package)_download_path=https://dl.bintray.com/boostorg/release/1.74.0/source
$(package)_file_name=$(package)_$($(package)_version).tar.bz2
$(package)_sha256_hash=83bfc1507731a0906e387fc28b7ef5417d591429e51e788417fe9ff025e116b1
$(package)_patches=signals2-noise.patch
$(package)_patches=iostreams-106.patch signals2-noise.patch
ifneq ($(host_os),darwin)
$(package)_dependencies=libcxx
@ -32,6 +32,7 @@ $(package)_ldflags+=-static-libstdc++ -lc++abi
endef
define $(package)_preprocess_cmds
patch -p2 < $($(package)_patch_dir)/iostreams-106.patch && \
patch -p2 < $($(package)_patch_dir)/signals2-noise.patch
endef

25
depends/patches/boost/iostreams-106.patch Normal file
View File

@ -0,0 +1,25 @@
From 4e76f73826fd0a7067b837e4850a9051436f5ec5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jean-Micha=C3=ABl=20Celerier?=
<jeanmichael.celerier+github@gmail.com>
Date: Sun, 22 Dec 2019 10:26:38 +0100
Subject: [PATCH] Fix build on windows with libc++
Proposed by @SquallATF in #67
---
include/boost/iostreams/detail/config/fpos.hpp | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/include/boost/iostreams/detail/config/fpos.hpp b/include/boost/iostreams/detail/config/fpos.hpp
index c5dc6cf59..a5835421f 100644
--- a/include/boost/iostreams/detail/config/fpos.hpp
+++ b/include/boost/iostreams/detail/config/fpos.hpp
@@ -26,7 +26,8 @@
# if (defined(_YVALS) || defined(_CPPLIB_VER)) && !defined(__SGI_STL_PORT) && \
!defined(_STLPORT_VERSION) && !defined(__QNX__) && !defined(_VX_CPU) && !defined(__VXWORKS__) \
- && !((defined(BOOST_MSVC) || defined(BOOST_CLANG)) && _MSVC_STL_VERSION >= 141)
+ && !((defined(BOOST_MSVC) || defined(BOOST_CLANG)) && _MSVC_STL_VERSION >= 141) \
+ && !defined(_LIBCPP_VERSION)
/**/
#include <boost/iostreams/detail/ios.hpp>