aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCheney-Wang <vcwrkspc@microsoft.com>2018-05-29 19:30:06 -0700
committerAlexander Karatarakis <alkarata@microsoft.com>2018-05-30 17:54:13 -0700
commit95c5566b8e954cd5514f434a117abb2fd4b892b6 (patch)
tree2bc9f7362ef456f46089a9bd9b74c64502728d66
parent1d52df8140104a969699f774dbae4fe25d2f6d00 (diff)
downloadvcpkg-95c5566b8e954cd5514f434a117abb2fd4b892b6.tar.gz
vcpkg-95c5566b8e954cd5514f434a117abb2fd4b892b6.zip
Remove call to nonexistent member seekpos() of std::fpos
-rw-r--r--ports/boost-iostreams/CONTROL2
-rw-r--r--ports/boost-iostreams/Removeseekpos.patch13
-rw-r--r--ports/boost-iostreams/portfile.cmake5
3 files changed, 19 insertions, 1 deletions
diff --git a/ports/boost-iostreams/CONTROL b/ports/boost-iostreams/CONTROL
index 249031a5a..a0ac4280c 100644
--- a/ports/boost-iostreams/CONTROL
+++ b/ports/boost-iostreams/CONTROL
@@ -1,5 +1,5 @@
# Automatically generated by boost-vcpkg-helpers/generate-ports.ps1
Source: boost-iostreams
-Version: 1.67.0
+Version: 1.67.1
Build-Depends: boost-assert, boost-bind, boost-build, boost-config, boost-core, boost-detail, boost-function, boost-integer, boost-iterator, boost-modular-build-helper, boost-mpl, boost-preprocessor, boost-range, boost-regex, boost-smart-ptr, boost-static-assert, boost-throw-exception, boost-type-traits, boost-utility, boost-vcpkg-helpers, bzip2, zlib, liblzma
Description: Boost iostreams module
diff --git a/ports/boost-iostreams/Removeseekpos.patch b/ports/boost-iostreams/Removeseekpos.patch
new file mode 100644
index 000000000..c2a5d4770
--- /dev/null
+++ b/ports/boost-iostreams/Removeseekpos.patch
@@ -0,0 +1,13 @@
+diff --git a/include/boost/iostreams/positioning.hpp b/include/boost/iostreams/positioning.hpp
+index 12f2afc..709da7d 100644
+--- a/include/boost/iostreams/positioning.hpp
++++ b/include/boost/iostreams/positioning.hpp
+@@ -93,7 +93,7 @@ inline stream_offset fpos_t_to_offset(std::fpos_t pos)
+ inline std::fpos_t streampos_to_fpos_t(std::streampos pos)
+ {
+ # if defined (_CPPLIB_VER) || defined(__IBMCPP__)
+- return pos.seekpos();
++ return pos;
+ # else
+ return pos.get_fpos_t();
+ # endif
diff --git a/ports/boost-iostreams/portfile.cmake b/ports/boost-iostreams/portfile.cmake
index c929f9ed7..a4eff5d85 100644
--- a/ports/boost-iostreams/portfile.cmake
+++ b/ports/boost-iostreams/portfile.cmake
@@ -18,6 +18,11 @@ vcpkg_download_distfile(LICENSE
file(COPY ${CMAKE_CURRENT_LIST_DIR}/CMakeLists.txt DESTINATION ${SOURCE_PATH})
+vcpkg_apply_patches(
+ SOURCE_PATH ${CURRENT_BUILDTREES_DIR}/src/ost-1.67.0-28e6d2af2f
+ PATCHES "${CURRENT_PORT_DIR}/Removeseekpos.patch"
+)
+
vcpkg_configure_cmake(
SOURCE_PATH ${SOURCE_PATH}
PREFER_NINJA