From: Kefu Chai <kchai@redhat.com>
Date: Wed, 12 Jun 2019 07:49:11 +0000 (+0800)
Subject: cmake: move boost patch to cmake/modules
X-Git-Tag: v15.1.0~2467^2~6
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=111d10df52d3b6631edc213374701811f42786c0;p=ceph.git

cmake: move boost patch to cmake/modules

as it's used by cmake only

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

diff --git a/cmake/modules/BuildBoost.cmake b/cmake/modules/BuildBoost.cmake
index c75eaff6e483..92ba07be1c72 100644
--- a/cmake/modules/BuildBoost.cmake
+++ b/cmake/modules/BuildBoost.cmake
@@ -163,7 +163,7 @@ function(do_build_boost version)
   include(ExternalProject)
   ExternalProject_Add(Boost
     ${source_dir}
-    PATCH_COMMAND patch -p1 < ${CMAKE_CURRENT_SOURCE_DIR}/patches/boost_context_asm_arm_syntax_unified.patch
+    PATCH_COMMAND patch -d <SOURCE_DIR> -p1 < ${CMAKE_MODULE_PATH}/boost_context_asm_arm_syntax_unified.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
new file mode 100644
index 000000000000..1106a00d4555
--- /dev/null
+++ b/cmake/modules/boost_context_asm_arm_syntax_unified.patch
@@ -0,0 +1,36 @@
+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/patches/boost_context_asm_arm_syntax_unified.patch b/patches/boost_context_asm_arm_syntax_unified.patch
deleted file mode 100644
index 1106a00d4555..000000000000
--- a/patches/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}