From d6834c5aab6b490f0549bd3cdc515a8ef4ac40bc Mon Sep 17 00:00:00 2001 From: "Kaleb S. KEITHLEY" Date: Mon, 9 Mar 2020 14:33:27 -0400 Subject: [PATCH] ceph 15.1.0, rhbz#1809799 Signed-off-by: Kaleb S. KEITHLEY --- 0001-cmake-modules-BuildBoost.cmake.patch | 13 +++++++++++++ 0001-src-common-crc32c_intel_fast.patch | 13 ------------- ceph.spec | 1 + 3 files changed, 14 insertions(+), 13 deletions(-) create mode 100644 0001-cmake-modules-BuildBoost.cmake.patch diff --git a/0001-cmake-modules-BuildBoost.cmake.patch b/0001-cmake-modules-BuildBoost.cmake.patch new file mode 100644 index 0000000..47ab7a7 --- /dev/null +++ b/0001-cmake-modules-BuildBoost.cmake.patch @@ -0,0 +1,13 @@ +diff --git a/cmake/modules/BuildBoost.cmake b/cmake/modules/BuildBoost.cmake +index 2e92132366..3cb1e3d958 100644 +--- a/cmake/modules/BuildBoost.cmake ++++ b/cmake/modules/BuildBoost.cmake +@@ -62,7 +62,7 @@ function(do_build_boost version) + else() + list(APPEND boost_features "address-model=32") + endif() +- set(BOOST_CXXFLAGS "-fPIC -w") # check on arm, etc <---XXX ++ set(BOOST_CXXFLAGS "-fPIC -w -fexceptions -fstack-protector-strong -grecord-gcc-switches -specs=/usr/lib/rpm/redhat/redhat-hardened-cc1 -specs=/usr/lib/rpm/redhat/redhat-annobin-cc1 -fasynchronous-unwind-tables -fstack-clash-protection -fcf-protection -ftemplate-depth-1024 -fno-new-ttp-matching -fno-builtin-malloc -fno-builtin-calloc -fno-builtin-realloc -fno-builtin-free") # check on arm, etc <---XXX + list(APPEND boost_features "cxxflags=${BOOST_CXXFLAGS}") + + set(boost_with_libs) diff --git a/0001-src-common-crc32c_intel_fast.patch b/0001-src-common-crc32c_intel_fast.patch index 0ec5e86..503dcd7 100644 --- a/0001-src-common-crc32c_intel_fast.patch +++ b/0001-src-common-crc32c_intel_fast.patch @@ -56,19 +56,6 @@ + +;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; +;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; -diff --git a/cmake/modules/BuildBoost.cmake b/cmake/modules/BuildBoost.cmake -index 2e92132366..3cb1e3d958 100644 ---- a/cmake/modules/BuildBoost.cmake -+++ b/cmake/modules/BuildBoost.cmake -@@ -62,7 +62,7 @@ function(do_build_boost version) - else() - list(APPEND boost_features "address-model=32") - endif() -- set(BOOST_CXXFLAGS "-fPIC -w") # check on arm, etc <---XXX -+ set(BOOST_CXXFLAGS "-fPIC -w -fexceptions -fstack-protector-strong -grecord-gcc-switches -specs=/usr/lib/rpm/redhat/redhat-hardened-cc1 -specs=/usr/lib/rpm/redhat/redhat-annobin-cc1 -fasynchronous-unwind-tables -fstack-clash-protection -fcf-protection -ftemplate-depth-1024 -fno-new-ttp-matching -fno-builtin-malloc -fno-builtin-calloc -fno-builtin-realloc -fno-builtin-free") # check on arm, etc <---XXX - list(APPEND boost_features "cxxflags=${BOOST_CXXFLAGS}") - - set(boost_with_libs) --- ceph-15.1.0/src/yasm-wrapper.orig 2020-03-09 12:57:37.603837466 -0400 +++ ceph-15.1.0/src/yasm-wrapper 2020-03-09 13:02:31.496796609 -0400 @@ -1,10 +1,11 @@ diff --git a/ceph.spec b/ceph.spec index 3a72030..544833f 100644 --- a/ceph.spec +++ b/ceph.spec @@ -130,6 +130,7 @@ Patch0001: 0001-src-common-crc32c_intel_fast.patch Patch0002: 0002-src-common-CMakeLists.txt.patch Patch0003: 0003-src-common-bitstr.h.patch Patch0004: 0004-src-test-rgw-test_rgw_reshart_wait.cc.patch +Patch0005: 0001-cmake-modules-BuildBoost.cmake.patch # ceph 14.0.1 does not support 32-bit architectures, bugs #1727788, #1727787 ExcludeArch: i686 armv7hl #################################################################################