[geode-native] branch develop updated: GEODE-6650: Update to Boost 1.70.0

[jb...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

jbarrett pushed a commit to branch develop
in repository https://gitbox.apache.org/repos/asf/geode-native.git


The following commit(s) were added to refs/heads/develop by this push:
     new 77e9a1c  GEODE-6650: Update to Boost 1.70.0
77e9a1c is described below

commit 77e9a1c8cdc71c8f0e4548fad8d84cf7b9970c86
Author: Jacob Barrett <jb...@pivotal.io>
AuthorDate: Sat Apr 13 09:18:13 2019 -0700

    GEODE-6650: Update to Boost 1.70.0
---
 dependencies/boost/CMakeLists.txt | 17 ++---------------
 dependencies/boost/patches        | 16 ----------------
 2 files changed, 2 insertions(+), 31 deletions(-)

diff --git a/dependencies/boost/CMakeLists.txt b/dependencies/boost/CMakeLists.txt
index 6fd3e99..629480d 100644
--- a/dependencies/boost/CMakeLists.txt
+++ b/dependencies/boost/CMakeLists.txt
@@ -13,9 +13,9 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-project( boost VERSION 1.68.0 LANGUAGES NONE )
+project( boost VERSION 1.70.0 LANGUAGES NONE )
 
-set( SHA256 da3411ea45622579d419bfda66f45cd0f8c32a181d84adfa936f5688388995cf )
+set( SHA256 882b48708d211a5f48e60b0124cf5863c1534cd544ecd0664bb534a4b5d506e9 )
 
 set(_B2_FLAGS
   -d0
@@ -77,19 +77,6 @@ ExternalProject_Get_Property( ${EXTERN} SOURCE_DIR )
 ExternalProject_Get_Property( ${EXTERN} INSTALL_DIR )
 set(INSTALL_DIR "${INSTALL_DIR}/$<CONFIG>")
 
-if (NOT WIN32)
-# https://github.com/boostorg/process/issues/51
-  set( PATCH_FILE ${CMAKE_CURRENT_SOURCE_DIR}/patches)
-  ExternalProject_Add_Step( ${EXTERN} patches
-      ALWAYS 0
-      DEPENDEES download
-      DEPENDERS patch
-      DEPENDS ${PATCH_FILE}
-      BYPRODUCTS ${SOURCE_DIR}/boost/process/detail/posix/is_running.hpp
-      COMMAND ${Patch_EXECUTABLE} -u -N -p1 < ${PATCH_FILE}
-  )
-endif()
-
 function(ADD_BOOST_LIBRARY)
   set(options)
   set(oneValueArgs)
diff --git a/dependencies/boost/patches b/dependencies/boost/patches
deleted file mode 100644
index 21bef7f..0000000
--- a/dependencies/boost/patches
+++ /dev/null
@@ -1,16 +0,0 @@
---- a/src/boost/process/detail/posix/is_running.hpp
-+++ b/src/boost/process/detail/posix/is_running.hpp
-@@ -16,8 +16,11 @@ namespace boost { namespace process { namespace detail { namespace posix {
- // Use the "stopped" state (WIFSTOPPED) to indicate "not terminated".
- // This bit arrangement of status codes is not guaranteed by POSIX, but (according to comments in
- // the glibc <bits/waitstatus.h> header) is the same across systems in practice.
--constexpr int still_active = 0x7F;
--static_assert(!WIFEXITED(still_active) && !WIFSIGNALED(still_active), "Internal Error");
-+constexpr int still_active = 0x017f;
-+static_assert(WIFSTOPPED(still_active), "Expected still_active to indicate WIFSTOPPED");
-+static_assert(!WIFEXITED(still_active), "Expected still_active to not indicate WIFEXITED");
-+static_assert(!WIFSIGNALED(still_active), "Expected still_active to not indicate WIFSIGNALED");
-+static_assert(!WIFCONTINUED(still_active), "Expected still_active to not indicate WIFCONTINUED");
-
- inline bool is_running(int code)
- {