From: Kefu Chai <kchai@redhat.com>
Date: Mon, 23 Dec 2019 15:17:04 +0000 (+0800)
Subject: cmake: build boost v1.72 instead of v1.67
X-Git-Tag: v15.1.0~387^2~1
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=e461bda6c9507b6b30e574f35fdf904870363111;p=ceph.git

cmake: build boost v1.72 instead of v1.67

so we can drop two patches which are already included by v1.72

Signed-off-by: Kefu Chai <kchai@redhat.com>
---

diff --git a/cmake/modules/BuildBoost.cmake b/cmake/modules/BuildBoost.cmake
index dc0081f7526..51c20d68982 100644
--- a/cmake/modules/BuildBoost.cmake
+++ b/cmake/modules/BuildBoost.cmake
@@ -142,14 +142,14 @@ function(do_build_boost version)
     check_boost_version("${PROJECT_SOURCE_DIR}/src/boost" ${version})
     set(source_dir
       SOURCE_DIR "${PROJECT_SOURCE_DIR}/src/boost")
-  elseif(version VERSION_GREATER 1.67)
+  elseif(version VERSION_GREATER 1.72)
     message(FATAL_ERROR "Unknown BOOST_REQUESTED_VERSION: ${version}")
   else()
     message(STATUS "boost will be downloaded...")
     # NOTE: If you change this version number make sure the package is available
     # at the three URLs below (may involve uploading to download.ceph.com)
-    set(boost_version 1.67.0)
-    set(boost_sha256 2684c972994ee57fc5632e03bf044746f6eb45d4920c343937a465fd67a5adba)
+    set(boost_version 1.72.0)
+    set(boost_sha256 59c9b274bc451cf91a9ba1dd2c7fdcaf5d60b1b3aa83f2c9fa143417cc660722)
     string(REPLACE "." "_" boost_version_underscore ${boost_version} )
     set(boost_url 
       https://dl.bintray.com/boostorg/release/${boost_version}/source/boost_${boost_version_underscore}.tar.bz2)
@@ -168,9 +168,6 @@ function(do_build_boost version)
   include(ExternalProject)
   ExternalProject_Add(Boost
     ${source_dir}
-    PATCH_COMMAND
-      patch -d <SOURCE_DIR> -p1 < ${CMAKE_MODULE_PATH}/boost_context_asm_arm_syntax_unified.patch &&
-      patch -d <SOURCE_DIR> -p1 < ${CMAKE_MODULE_PATH}/boost_lockfree_queue_valgrind_error.patch
     CONFIGURE_COMMAND CC=${CMAKE_C_COMPILER} CXX=${CMAKE_CXX_COMPILER} ${configure_command}
     BUILD_COMMAND CC=${CMAKE_C_COMPILER} CXX=${CMAKE_CXX_COMPILER} ${build_command}
     BUILD_IN_SOURCE 1
diff --git a/cmake/modules/boost_context_asm_arm_syntax_unified.patch b/cmake/modules/boost_context_asm_arm_syntax_unified.patch
deleted file mode 100644
index 1106a00d455..00000000000
--- a/cmake/modules/boost_context_asm_arm_syntax_unified.patch
+++ /dev/null
@@ -1,36 +0,0 @@
-diff --git a/libs/context/src/asm/jump_arm_aapcs_elf_gas.S b/src/Boost/libs/context/src/asm/jump_arm_aapcs_elf_gas.S
-index d0f7fa2..58d11b0 100644
---- a/libs/context/src/asm/jump_arm_aapcs_elf_gas.S
-+++ b/libs/context/src/asm/jump_arm_aapcs_elf_gas.S
-@@ -42,6 +42,7 @@
- .globl jump_fcontext
- .align 2
- .type jump_fcontext,%function
-+.syntax unified
- jump_fcontext:
-     @ save LR as PC
-     push {lr}
-diff --git a/libs/context/src/asm/make_arm_aapcs_elf_gas.S b/src/Boost/libs/context/src/asm/make_arm_aapcs_elf_gas.S
-index 98819a2..b88ff68 100644
---- a/libs/context/src/asm/make_arm_aapcs_elf_gas.S
-+++ b/libs/context/src/asm/make_arm_aapcs_elf_gas.S
-@@ -42,6 +42,7 @@
- .globl make_fcontext
- .align 2
- .type make_fcontext,%function
-+.syntax unified
- make_fcontext:
-     @ shift address in A1 to lower 16 byte boundary
-     bic  a1, a1, #15
-diff --git a/libs/context/src/asm/ontop_arm_aapcs_elf_gas.S b/src/Boost/libs/context/src/asm/ontop_arm_aapcs_elf_gas.S
-index 9d9198f..2efebbb 100644
---- a/libs/context/src/asm/ontop_arm_aapcs_elf_gas.S
-+++ b/libs/context/src/asm/ontop_arm_aapcs_elf_gas.S
-@@ -42,6 +42,7 @@
- .globl ontop_fcontext
- .align 2
- .type ontop_fcontext,%function
-+.syntax unified
- ontop_fcontext:
-     @ save LR as PC
-     push {lr}
diff --git a/cmake/modules/boost_lockfree_queue_valgrind_error.patch b/cmake/modules/boost_lockfree_queue_valgrind_error.patch
deleted file mode 100644
index 17d9e167410..00000000000
--- a/cmake/modules/boost_lockfree_queue_valgrind_error.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/boost/lockfree/queue.hpp
-+++ b/boost/lockfree/queue.hpp
-@@ -108,7 +108,7 @@
-         typedef typename detail::select_tagged_handle<node, node_based>::handle_type handle_type;
- 
-         node(T const & v, handle_type null_handle):
--            data(v)//, next(tagged_node_handle(0, 0))
-+            next(tagged_node_handle(null_handle, 0)), data(v)
-         {
-             /* increment tag to avoid ABA problem */
-             tagged_node_handle old_next = next.load(memory_order_relaxed);