packages/ceph
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix conflicts among multiple processor architectures

Browse Source 
Signed-off-by: liuqinfei <lucas.liuqinfei@huawei.com>
This commit is contained in:
liuqinfei 2023-08-21 21:04:38 +08:00
parent 82ca47f302
commit 6e5f3cec37
3 changed files with 111 additions and 109 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
0008-cmake-enable-sw64-architecture.patch Normal file
View File

@ -0,0 +1,11 @@
--- ceph-ori/cmake/modules/CheckCxxAtomic.cmake 2023-08-21 20:20:31.009088704 +0800
+++ ceph-16.2.7/cmake/modules/CheckCxxAtomic.cmake 2023-08-21 20:20:53.629126721 +0800
@@ -11,7 +11,7 @@ function(check_cxx_atomics var)
#include <atomic>
#include <cstdint>
-#if __s390x__
+#if defined(__s390x__) || defined(__sw_64__)
// Boost needs 16-byte atomics for tagged pointers.
// These are implemented via inline instructions on the platform
// if 16-byte alignment can be proven, and are delegated to libatomic

196
0008-enable-sw64-architecture.patch → 0021-boost-enable-sw64-architecture.patch
View File

@ -1,18 +1,6 @@
diff -Nuar ceph-16.2.7.org/cmake/modules/CheckCxxAtomic.cmake ceph-16.2.7.sw/cmake/modules/CheckCxxAtomic.cmake
--- ceph-16.2.7.org/cmake/modules/CheckCxxAtomic.cmake 2022-05-23 15:33:25.850000000 +0000
+++ ceph-16.2.7.sw/cmake/modules/CheckCxxAtomic.cmake 2022-05-26 10:42:55.850000000 +0000
@@ -11,7 +11,7 @@
#include <atomic>
#include <cstdint>
-#if __s390x__
+#if defined(__s390x__) || defined(__sw_64__)
// Boost needs 16-byte atomics for tagged pointers.
// These are implemented via inline instructions on the platform
// if 16-byte alignment can be proven, and are delegated to libatomic
diff -Nuar ceph-16.2.7.org/src/boost/boost/atomic/detail/caps_gcc_sw_64.hpp ceph-16.2.7.sw/src/boost/boost/atomic/detail/caps_gcc_sw_64.hpp
--- ceph-16.2.7.org/src/boost/boost/atomic/detail/caps_gcc_sw_64.hpp 1970-01-01 00:00:00.000000000 +0000
+++ ceph-16.2.7.sw/src/boost/boost/atomic/detail/caps_gcc_sw_64.hpp 2022-05-26 10:45:28.260000000 +0000
diff -uprN ceph-ori/src/boost/boost/atomic/detail/caps_gcc_sw_64.hpp ceph-16.2.7/src/boost/boost/atomic/detail/caps_gcc_sw_64.hpp
--- ceph-ori/src/boost/boost/atomic/detail/caps_gcc_sw_64.hpp 1970-01-01 08:00:00.000000000 +0800
+++ ceph-16.2.7/src/boost/boost/atomic/detail/caps_gcc_sw_64.hpp 2023-08-21 20:20:53.633126727 +0800
@@ -0,0 +1,34 @@
+/*
+ * Distributed under the Boost Software License, Version 1.0.
@ -48,9 +36,9 @@ diff -Nuar ceph-16.2.7.org/src/boost/boost/atomic/detail/caps_gcc_sw_64.hpp ceph
+#define BOOST_ATOMIC_SIGNAL_FENCE 2
+
+#endif // BOOST_ATOMIC_DETAIL_CAPS_GCC_SW_64_HPP_INCLUDED_
diff -Nuar ceph-16.2.7.org/src/boost/boost/atomic/detail/ops_gcc_sw_64.hpp ceph-16.2.7.sw/src/boost/boost/atomic/detail/ops_gcc_sw_64.hpp
--- ceph-16.2.7.org/src/boost/boost/atomic/detail/ops_gcc_sw_64.hpp 1970-01-01 00:00:00.000000000 +0000
+++ ceph-16.2.7.sw/src/boost/boost/atomic/detail/ops_gcc_sw_64.hpp 2022-05-26 10:46:00.910000000 +0000
diff -uprN ceph-ori/src/boost/boost/atomic/detail/ops_gcc_sw_64.hpp ceph-16.2.7/src/boost/boost/atomic/detail/ops_gcc_sw_64.hpp
--- ceph-ori/src/boost/boost/atomic/detail/ops_gcc_sw_64.hpp 1970-01-01 08:00:00.000000000 +0800
+++ ceph-16.2.7/src/boost/boost/atomic/detail/ops_gcc_sw_64.hpp 2023-08-21 20:20:53.633126727 +0800
@@ -0,0 +1,1039 @@
+/*
+ * Distributed under the Boost Software License, Version 1.0.
@ -1091,9 +1079,9 @@ diff -Nuar ceph-16.2.7.org/src/boost/boost/atomic/detail/ops_gcc_sw_64.hpp ceph-
+
+
+#endif // BOOST_ATOMIC_DETAIL_OPS_GCC_SW_64_HPP_INCLUDED_
diff -Nuar ceph-16.2.7.org/src/boost/boost/atomic/detail/platform.hpp ceph-16.2.7.sw/src/boost/boost/atomic/detail/platform.hpp
--- ceph-16.2.7.org/src/boost/boost/atomic/detail/platform.hpp 2022-05-23 15:33:13.990000000 +0000
+++ ceph-16.2.7.sw/src/boost/boost/atomic/detail/platform.hpp 2022-05-26 10:48:27.060000000 +0000
diff -uprN ceph-ori/src/boost/boost/atomic/detail/platform.hpp ceph-16.2.7/src/boost/boost/atomic/detail/platform.hpp
--- ceph-ori/src/boost/boost/atomic/detail/platform.hpp 2023-08-21 20:20:33.045092126 +0800
+++ ceph-16.2.7/src/boost/boost/atomic/detail/platform.hpp 2023-08-21 20:20:53.633126727 +0800
@@ -72,6 +72,10 @@
#define BOOST_ATOMIC_DETAIL_PLATFORM gcc_alpha
@ -1105,9 +1093,9 @@ diff -Nuar ceph-16.2.7.org/src/boost/boost/atomic/detail/platform.hpp ceph-16.2.
#elif defined(_MSC_VER) && (defined(_M_IX86) || defined(_M_X64))
#define BOOST_ATOMIC_DETAIL_PLATFORM msvc_x86
diff -Nuar ceph-16.2.7.org/src/boost/boost/numeric/interval/detail/sw_64_rounding_control.hpp ceph-16.2.7.sw/src/boost/boost/numeric/interval/detail/sw_64_rounding_control.hpp
--- ceph-16.2.7.org/src/boost/boost/numeric/interval/detail/sw_64_rounding_control.hpp 1970-01-01 00:00:00.000000000 +0000
+++ ceph-16.2.7.sw/src/boost/boost/numeric/interval/detail/sw_64_rounding_control.hpp 2022-05-26 10:49:09.580000000 +0000
diff -uprN ceph-ori/src/boost/boost/numeric/interval/detail/sw_64_rounding_control.hpp ceph-16.2.7/src/boost/boost/numeric/interval/detail/sw_64_rounding_control.hpp
--- ceph-ori/src/boost/boost/numeric/interval/detail/sw_64_rounding_control.hpp 1970-01-01 08:00:00.000000000 +0800
+++ ceph-16.2.7/src/boost/boost/numeric/interval/detail/sw_64_rounding_control.hpp 2023-08-21 20:20:53.633126727 +0800
@@ -0,0 +1,113 @@
+/* Boost interval/detail/sw_64_rounding_control.hpp file
+ *
@ -1222,9 +1210,9 @@ diff -Nuar ceph-16.2.7.org/src/boost/boost/numeric/interval/detail/sw_64_roundin
+#endif
+
+#endif /* BOOST_NUMERIC_INTERVAL_DETAIL_SW_64_ROUNDING_CONTROL_HPP */
diff -Nuar ceph-16.2.7.org/src/boost/boost/numeric/interval/hw_rounding.hpp ceph-16.2.7.sw/src/boost/boost/numeric/interval/hw_rounding.hpp
--- ceph-16.2.7.org/src/boost/boost/numeric/interval/hw_rounding.hpp 2022-05-23 15:33:12.870000000 +0000
+++ ceph-16.2.7.sw/src/boost/boost/numeric/interval/hw_rounding.hpp 2022-05-26 10:51:06.540000000 +0000
diff -uprN ceph-ori/src/boost/boost/numeric/interval/hw_rounding.hpp ceph-16.2.7/src/boost/boost/numeric/interval/hw_rounding.hpp
--- ceph-ori/src/boost/boost/numeric/interval/hw_rounding.hpp 2023-08-21 20:20:32.773091669 +0800
+++ ceph-16.2.7/src/boost/boost/numeric/interval/hw_rounding.hpp 2023-08-21 20:20:53.633126727 +0800
@@ -29,6 +29,8 @@
# include <boost/numeric/interval/detail/sparc_rounding_control.hpp>
#elif defined(alpha) || defined(__alpha__)
@ -1234,9 +1222,9 @@ diff -Nuar ceph-16.2.7.org/src/boost/boost/numeric/interval/hw_rounding.hpp ceph
#elif defined(ia64) || defined(__ia64) || defined(__ia64__)
# include <boost/numeric/interval/detail/ia64_rounding_control.hpp>
#endif
diff -Nuar ceph-16.2.7.org/src/boost/boost/predef/architecture/sw_64.h ceph-16.2.7.sw/src/boost/boost/predef/architecture/sw_64.h
--- ceph-16.2.7.org/src/boost/boost/predef/architecture/sw_64.h 1970-01-01 00:00:00.000000000 +0000
+++ ceph-16.2.7.sw/src/boost/boost/predef/architecture/sw_64.h 2022-05-26 10:52:11.260000000 +0000
diff -uprN ceph-ori/src/boost/boost/predef/architecture/sw_64.h ceph-16.2.7/src/boost/boost/predef/architecture/sw_64.h
--- ceph-ori/src/boost/boost/predef/architecture/sw_64.h 1970-01-01 08:00:00.000000000 +0800
+++ ceph-16.2.7/src/boost/boost/predef/architecture/sw_64.h 2023-08-21 20:20:53.633126727 +0800
@@ -0,0 +1,54 @@
+/*
+Copyright Rene Rivera 2008-2015
@ -1292,10 +1280,10 @@ diff -Nuar ceph-16.2.7.org/src/boost/boost/predef/architecture/sw_64.h ceph-16.2
+
+#include <boost/predef/detail/test.h>
+BOOST_PREDEF_DECLARE_TEST(BOOST_ARCH_SW_64,BOOST_ARCH_SW_64_NAME)
diff -Nuar ceph-16.2.7.org/src/boost/boost/predef/architecture.h ceph-16.2.7.sw/src/boost/boost/predef/architecture.h
--- ceph-16.2.7.org/src/boost/boost/predef/architecture.h 2022-05-23 15:33:13.820000000 +0000
+++ ceph-16.2.7.sw/src/boost/boost/predef/architecture.h 2022-05-26 10:52:46.950000000 +0000
@@ -11,6 +11,7 @@
diff -uprN ceph-ori/src/boost/boost/predef/architecture.h ceph-16.2.7/src/boost/boost/predef/architecture.h
--- ceph-ori/src/boost/boost/predef/architecture.h 2023-08-21 20:20:33.013092072 +0800
+++ ceph-16.2.7/src/boost/boost/predef/architecture.h 2023-08-21 20:20:53.633126727 +0800
@@ -11,6 +11,7 @@ http://www.boost.org/LICENSE_1_0.txt)
#endif
#include <boost/predef/architecture/alpha.h>
@ -1303,9 +1291,9 @@ diff -Nuar ceph-16.2.7.org/src/boost/boost/predef/architecture.h ceph-16.2.7.sw/
#include <boost/predef/architecture/arm.h>
#include <boost/predef/architecture/blackfin.h>
#include <boost/predef/architecture/convex.h>
diff -Nuar ceph-16.2.7.org/src/boost/boost/units/systems/si/codata/atomic-nuclear_constants.hpp ceph-16.2.7.sw/src/boost/boost/units/systems/si/codata/atomic-nuclear_constants.hpp
--- ceph-16.2.7.org/src/boost/boost/units/systems/si/codata/atomic-nuclear_constants.hpp 2022-05-23 15:33:12.700000000 +0000
+++ ceph-16.2.7.sw/src/boost/boost/units/systems/si/codata/atomic-nuclear_constants.hpp 2022-05-26 10:53:20.320000000 +0000
diff -uprN ceph-ori/src/boost/boost/units/systems/si/codata/atomic-nuclear_constants.hpp ceph-16.2.7/src/boost/boost/units/systems/si/codata/atomic-nuclear_constants.hpp
--- ceph-ori/src/boost/boost/units/systems/si/codata/atomic-nuclear_constants.hpp 2023-08-21 20:20:32.733091602 +0800
+++ ceph-16.2.7/src/boost/boost/units/systems/si/codata/atomic-nuclear_constants.hpp 2023-08-21 20:20:53.633126727 +0800
@@ -12,6 +12,7 @@
#define BOOST_UNITS_CODATA_ATOMIC_AND_NUCLEAR_CONSTANTS_HPP
@ -1314,9 +1302,9 @@ diff -Nuar ceph-16.2.7.org/src/boost/boost/units/systems/si/codata/atomic-nuclea
#include <boost/units/systems/si/codata/deuteron_constants.hpp>
#include <boost/units/systems/si/codata/electron_constants.hpp>
#include <boost/units/systems/si/codata/helion_constants.hpp>
diff -Nuar ceph-16.2.7.org/src/boost/boost/units/systems/si/codata/sw_64_constants.hpp ceph-16.2.7.sw/src/boost/boost/units/systems/si/codata/sw_64_constants.hpp
--- ceph-16.2.7.org/src/boost/boost/units/systems/si/codata/sw_64_constants.hpp 1970-01-01 00:00:00.000000000 +0000
+++ ceph-16.2.7.sw/src/boost/boost/units/systems/si/codata/sw_64_constants.hpp 2022-05-26 10:53:56.950000000 +0000
diff -uprN ceph-ori/src/boost/boost/units/systems/si/codata/sw_64_constants.hpp ceph-16.2.7/src/boost/boost/units/systems/si/codata/sw_64_constants.hpp
--- ceph-ori/src/boost/boost/units/systems/si/codata/sw_64_constants.hpp 1970-01-01 08:00:00.000000000 +0800
+++ ceph-16.2.7/src/boost/boost/units/systems/si/codata/sw_64_constants.hpp 2023-08-21 20:20:53.633126727 +0800
@@ -0,0 +1,66 @@
+// Boost.Units - A C++ library for zero-overhead dimensional analysis and
+// unit/quantity manipulation and conversion
@ -1384,9 +1372,9 @@ diff -Nuar ceph-16.2.7.org/src/boost/boost/units/systems/si/codata/sw_64_constan
+} // namespace boost
+
+#endif // BOOST_UNITS_CODATA_SW_64_CONSTANTS_HPP
diff -Nuar ceph-16.2.7.org/src/boost/boost/wave/wave_config.hpp ceph-16.2.7.sw/src/boost/boost/wave/wave_config.hpp
--- ceph-16.2.7.org/src/boost/boost/wave/wave_config.hpp 2022-05-23 15:33:14.460000000 +0000
+++ ceph-16.2.7.sw/src/boost/boost/wave/wave_config.hpp 2022-05-26 10:54:50.330000000 +0000
diff -uprN ceph-ori/src/boost/boost/wave/wave_config.hpp ceph-16.2.7/src/boost/boost/wave/wave_config.hpp
--- ceph-ori/src/boost/boost/wave/wave_config.hpp 2023-08-21 20:20:33.161092321 +0800
+++ ceph-16.2.7/src/boost/boost/wave/wave_config.hpp 2023-08-21 20:20:53.633126727 +0800
@@ -205,7 +205,7 @@
// CW up to 8.3 chokes as well *sigh*
// Tru64/CXX has linker problems when using flex_string
@ -1396,10 +1384,10 @@ diff -Nuar ceph-16.2.7.org/src/boost/boost/wave/wave_config.hpp ceph-16.2.7.sw/s
defined(BOOST_WAVE_STRINGTYPE_USE_STDSTRING)
#define BOOST_WAVE_STRINGTYPE std::string
diff -Nuar ceph-16.2.7.org/src/boost/boostcpp.jam ceph-16.2.7.sw/src/boost/boostcpp.jam
--- ceph-16.2.7.org/src/boost/boostcpp.jam 2022-05-23 15:33:14.570000000 +0000
+++ ceph-16.2.7.sw/src/boost/boostcpp.jam 2022-05-26 10:56:12.360000000 +0000
@@ -607,7 +607,7 @@
diff -uprN ceph-ori/src/boost/boostcpp.jam ceph-16.2.7/src/boost/boostcpp.jam
--- ceph-ori/src/boost/boostcpp.jam 2023-08-21 20:20:33.185092361 +0800
+++ ceph-16.2.7/src/boost/boostcpp.jam 2023-08-21 20:20:53.633126727 +0800
@@ -607,7 +607,7 @@ rule address-model ( )
return <conditional>@boostcpp.deduce-address-model ;
}
@ -1408,7 +1396,7 @@ diff -Nuar ceph-16.2.7.org/src/boost/boostcpp.jam ceph-16.2.7.sw/src/boost/boost
feature.feature deduced-architecture : $(deducable-architectures) : propagated optional composite hidden ;
for a in $(deducable-architectures)
{
@@ -618,8 +618,9 @@
@@ -618,8 +618,9 @@ rule deduce-architecture ( properties *
{
local result ;
local filtered = [ toolset-properties $(properties) ] ;
@ -1419,10 +1407,10 @@ diff -Nuar ceph-16.2.7.org/src/boost/boostcpp.jam ceph-16.2.7.sw/src/boost/boost
: /boost/architecture//arm
: /boost/architecture//mips1
: /boost/architecture//power
diff -Nuar ceph-16.2.7.org/src/boost/libs/atomic/test/lockfree.cpp ceph-16.2.7.sw/src/boost/libs/atomic/test/lockfree.cpp
--- ceph-16.2.7.org/src/boost/libs/atomic/test/lockfree.cpp 2022-05-23 15:33:18.210000000 +0000
+++ ceph-16.2.7.sw/src/boost/libs/atomic/test/lockfree.cpp 2022-05-26 10:56:35.650000000 +0000
@@ -100,7 +100,7 @@
diff -uprN ceph-ori/src/boost/libs/atomic/test/lockfree.cpp ceph-16.2.7/src/boost/libs/atomic/test/lockfree.cpp
--- ceph-ori/src/boost/libs/atomic/test/lockfree.cpp 2023-08-21 20:20:33.533092946 +0800
+++ ceph-16.2.7/src/boost/libs/atomic/test/lockfree.cpp 2023-08-21 20:20:53.633126727 +0800
@@ -100,7 +100,7 @@ void verify_lock_free(const char* type_n
#define EXPECT_POINTER_LOCK_FREE 2
#define EXPECT_BOOL_LOCK_FREE 2
@ -1431,10 +1419,10 @@ diff -Nuar ceph-16.2.7.org/src/boost/libs/atomic/test/lockfree.cpp ceph-16.2.7.s
#define EXPECT_CHAR_LOCK_FREE 2
#define EXPECT_CHAR16_T_LOCK_FREE 2
diff -Nuar ceph-16.2.7.org/src/boost/libs/config/checks/architecture/Jamroot.jam ceph-16.2.7.sw/src/boost/libs/config/checks/architecture/Jamroot.jam
--- ceph-16.2.7.org/src/boost/libs/config/checks/architecture/Jamroot.jam 2022-05-23 15:33:15.570000000 +0000
+++ ceph-16.2.7.sw/src/boost/libs/config/checks/architecture/Jamroot.jam 2022-05-26 10:57:12.410000000 +0000
@@ -16,6 +16,7 @@
diff -uprN ceph-ori/src/boost/libs/config/checks/architecture/Jamroot.jam ceph-16.2.7/src/boost/libs/config/checks/architecture/Jamroot.jam
--- ceph-ori/src/boost/libs/config/checks/architecture/Jamroot.jam 2023-08-21 20:20:33.825093437 +0800
+++ ceph-16.2.7/src/boost/libs/config/checks/architecture/Jamroot.jam 2023-08-21 20:20:53.633126727 +0800
@@ -16,6 +16,7 @@ obj 32 : 32.cpp ;
obj 64 : 64.cpp ;
obj arm : arm.cpp ;
@ -1442,9 +1430,9 @@ diff -Nuar ceph-16.2.7.org/src/boost/libs/config/checks/architecture/Jamroot.jam
obj combined : combined.cpp ;
obj mips1 : mips1.cpp ;
obj power : power.cpp ;
diff -Nuar ceph-16.2.7.org/src/boost/libs/config/checks/architecture/sw_64.cpp ceph-16.2.7.sw/src/boost/libs/config/checks/architecture/sw_64.cpp
--- ceph-16.2.7.org/src/boost/libs/config/checks/architecture/sw_64.cpp 1970-01-01 00:00:00.000000000 +0000
+++ ceph-16.2.7.sw/src/boost/libs/config/checks/architecture/sw_64.cpp 2022-05-26 10:57:46.010000000 +0000
diff -uprN ceph-ori/src/boost/libs/config/checks/architecture/sw_64.cpp ceph-16.2.7/src/boost/libs/config/checks/architecture/sw_64.cpp
--- ceph-ori/src/boost/libs/config/checks/architecture/sw_64.cpp 1970-01-01 08:00:00.000000000 +0800
+++ ceph-16.2.7/src/boost/libs/config/checks/architecture/sw_64.cpp 2023-08-21 20:20:53.633126727 +0800
@@ -0,0 +1,15 @@
+// sw_64.cpp
+
@ -1461,10 +1449,10 @@ diff -Nuar ceph-16.2.7.org/src/boost/libs/config/checks/architecture/sw_64.cpp c
+#error "Not SW_64"
+#endif
+
diff -Nuar ceph-16.2.7.org/src/boost/libs/config/test/config_info.cpp ceph-16.2.7.sw/src/boost/libs/config/test/config_info.cpp
--- ceph-16.2.7.org/src/boost/libs/config/test/config_info.cpp 2022-05-23 15:33:15.540000000 +0000
+++ ceph-16.2.7.sw/src/boost/libs/config/test/config_info.cpp 2022-05-26 10:58:47.330000000 +0000
@@ -173,6 +173,7 @@
diff -uprN ceph-ori/src/boost/libs/config/test/config_info.cpp ceph-16.2.7/src/boost/libs/config/test/config_info.cpp
--- ceph-ori/src/boost/libs/config/test/config_info.cpp 2023-08-21 20:20:33.817093423 +0800
+++ ceph-16.2.7/src/boost/libs/config/test/config_info.cpp 2023-08-21 20:20:53.633126727 +0800
@@ -173,6 +173,7 @@ void print_compiler_macros()
PRINT_MACRO(_M_IX86_FP);
PRINT_MACRO(_M_X64);
PRINT_MACRO(_M_ALPHA);
@ -1472,7 +1460,7 @@ diff -Nuar ceph-16.2.7.org/src/boost/libs/config/test/config_info.cpp ceph-16.2.
PRINT_MACRO(_M_MPPC);
PRINT_MACRO(_M_MRX000);
PRINT_MACRO(_M_PPC);
@@ -229,6 +230,7 @@
@@ -229,6 +230,7 @@ void print_compiler_macros()
PRINT_MACRO(__MINGW32__);
PRINT_MACRO(__GXX_RTTI);
PRINT_MACRO(__alpha__);
@ -1480,10 +1468,10 @@ diff -Nuar ceph-16.2.7.org/src/boost/libs/config/test/config_info.cpp ceph-16.2.
PRINT_MACRO(__amd64__);
PRINT_MACRO(__arm__);
PRINT_MACRO(__aarch64__);
diff -Nuar ceph-16.2.7.org/src/boost/libs/context/build/architecture.jam ceph-16.2.7.sw/src/boost/libs/context/build/architecture.jam
--- ceph-16.2.7.org/src/boost/libs/context/build/architecture.jam 2022-05-23 15:33:16.460000000 +0000
+++ ceph-16.2.7.sw/src/boost/libs/context/build/architecture.jam 2022-05-26 11:00:55.230000000 +0000
@@ -55,6 +55,10 @@
diff -uprN ceph-ori/src/boost/libs/context/build/architecture.jam ceph-16.2.7/src/boost/libs/context/build/architecture.jam
--- ceph-ori/src/boost/libs/context/build/architecture.jam 2023-08-21 20:20:34.021093766 +0800
+++ ceph-16.2.7/src/boost/libs/context/build/architecture.jam 2023-08-21 20:20:53.637126734 +0800
@@ -55,6 +55,10 @@ rule deduce-architecture ( properties *
{
return <architecture>arm ;
}
@ -1494,10 +1482,10 @@ diff -Nuar ceph-16.2.7.org/src/boost/libs/context/build/architecture.jam ceph-16
else if [ configure.builds /boost/architecture//mips1 : $(properties) : mips1 ]
{
return <architecture>mips1 ;
diff -Nuar ceph-16.2.7.org/src/boost/libs/context/build/Jamfile.v2 ceph-16.2.7.sw/src/boost/libs/context/build/Jamfile.v2
--- ceph-16.2.7.org/src/boost/libs/context/build/Jamfile.v2 2022-05-23 15:33:16.460000000 +0000
+++ ceph-16.2.7.sw/src/boost/libs/context/build/Jamfile.v2 2022-05-26 11:06:57.310000000 +0000
@@ -75,6 +75,7 @@
diff -uprN ceph-ori/src/boost/libs/context/build/Jamfile.v2 ceph-16.2.7/src/boost/libs/context/build/Jamfile.v2
--- ceph-ori/src/boost/libs/context/build/Jamfile.v2 2023-08-21 20:20:34.021093766 +0800
+++ ceph-16.2.7/src/boost/libs/context/build/Jamfile.v2 2023-08-21 20:20:53.637126734 +0800
@@ -75,6 +75,7 @@ local rule default_abi ( )
if [ os.name ] = "NT" { tmp = ms ; }
else if [ os.name ] = "CYGWIN" { tmp = ms ; }
else if [ os.platform ] = "ARM" { tmp = aapcs ; }
@ -1505,7 +1493,7 @@ diff -Nuar ceph-16.2.7.org/src/boost/libs/context/build/Jamfile.v2 ceph-16.2.7.s
else if [ os.platform ] = "MIPS32" { tmp = o32 ; }
else if [ os.platform ] = "MIPS64" { tmp = n64 ; }
return $(tmp) ;
@@ -177,6 +178,30 @@
@@ -177,6 +178,30 @@ alias asm_sources
<toolset>msvc
;
@ -1536,9 +1524,9 @@ diff -Nuar ceph-16.2.7.org/src/boost/libs/context/build/Jamfile.v2 ceph-16.2.7.s
# ARM64
# ARM64/AAPCS/ELF
alias asm_sources
diff -Nuar ceph-16.2.7.org/src/boost/libs/context/src/asm/jump_sw_64_aapcs_elf_gas.S ceph-16.2.7.sw/src/boost/libs/context/src/asm/jump_sw_64_aapcs_elf_gas.S
--- ceph-16.2.7.org/src/boost/libs/context/src/asm/jump_sw_64_aapcs_elf_gas.S 1970-01-01 00:00:00.000000000 +0000
+++ ceph-16.2.7.sw/src/boost/libs/context/src/asm/jump_sw_64_aapcs_elf_gas.S 2022-05-26 11:07:35.330000000 +0000
diff -uprN ceph-ori/src/boost/libs/context/src/asm/jump_sw_64_aapcs_elf_gas.S ceph-16.2.7/src/boost/libs/context/src/asm/jump_sw_64_aapcs_elf_gas.S
--- ceph-ori/src/boost/libs/context/src/asm/jump_sw_64_aapcs_elf_gas.S 1970-01-01 08:00:00.000000000 +0800
+++ ceph-16.2.7/src/boost/libs/context/src/asm/jump_sw_64_aapcs_elf_gas.S 2023-08-21 20:20:53.637126734 +0800
@@ -0,0 +1,86 @@
+.text
+.align 2
@ -1626,9 +1614,9 @@ diff -Nuar ceph-16.2.7.org/src/boost/libs/context/src/asm/jump_sw_64_aapcs_elf_g
+.size jump_fcontext,.-jump_fcontext
+# Mark that we don't need executable stack.
+.section .note.GNU-stack,"",%progbits
diff -Nuar ceph-16.2.7.org/src/boost/libs/context/src/asm/make_sw_64_aapcs_elf_gas.S ceph-16.2.7.sw/src/boost/libs/context/src/asm/make_sw_64_aapcs_elf_gas.S
--- ceph-16.2.7.org/src/boost/libs/context/src/asm/make_sw_64_aapcs_elf_gas.S 1970-01-01 00:00:00.000000000 +0000
+++ ceph-16.2.7.sw/src/boost/libs/context/src/asm/make_sw_64_aapcs_elf_gas.S 2022-05-26 11:07:52.120000000 +0000
diff -uprN ceph-ori/src/boost/libs/context/src/asm/make_sw_64_aapcs_elf_gas.S ceph-16.2.7/src/boost/libs/context/src/asm/make_sw_64_aapcs_elf_gas.S
--- ceph-ori/src/boost/libs/context/src/asm/make_sw_64_aapcs_elf_gas.S 1970-01-01 08:00:00.000000000 +0800
+++ ceph-16.2.7/src/boost/libs/context/src/asm/make_sw_64_aapcs_elf_gas.S 2023-08-21 20:20:53.637126734 +0800
@@ -0,0 +1,37 @@
+.text
+.align 2
@ -1667,9 +1655,9 @@ diff -Nuar ceph-16.2.7.org/src/boost/libs/context/src/asm/make_sw_64_aapcs_elf_g
+.size make_fcontext,.-make_fcontext
+# Mark that we don't need executable stack.
+.section .note.GNU-stack,"",%progbits
diff -Nuar ceph-16.2.7.org/src/boost/libs/context/src/asm/ontop_sw_64_aapcs_elf_gas.S ceph-16.2.7.sw/src/boost/libs/context/src/asm/ontop_sw_64_aapcs_elf_gas.S
--- ceph-16.2.7.org/src/boost/libs/context/src/asm/ontop_sw_64_aapcs_elf_gas.S 1970-01-01 00:00:00.000000000 +0000
+++ ceph-16.2.7.sw/src/boost/libs/context/src/asm/ontop_sw_64_aapcs_elf_gas.S 2022-05-26 11:08:14.440000000 +0000
diff -uprN ceph-ori/src/boost/libs/context/src/asm/ontop_sw_64_aapcs_elf_gas.S ceph-16.2.7/src/boost/libs/context/src/asm/ontop_sw_64_aapcs_elf_gas.S
--- ceph-ori/src/boost/libs/context/src/asm/ontop_sw_64_aapcs_elf_gas.S 1970-01-01 08:00:00.000000000 +0800
+++ ceph-16.2.7/src/boost/libs/context/src/asm/ontop_sw_64_aapcs_elf_gas.S 2023-08-21 20:20:53.637126734 +0800
@@ -0,0 +1,85 @@
+.text
+.align 2
@ -1756,10 +1744,10 @@ diff -Nuar ceph-16.2.7.org/src/boost/libs/context/src/asm/ontop_sw_64_aapcs_elf_
+.size ontop_fcontext,.-ontop_fcontext
+# Mark that we don't need executable stack.
+.section .note.GNU-stack,"",%progbits
diff -Nuar ceph-16.2.7.org/src/boost/libs/log/build/log-architecture.jam ceph-16.2.7.sw/src/boost/libs/log/build/log-architecture.jam
--- ceph-16.2.7.org/src/boost/libs/log/build/log-architecture.jam 2022-05-23 15:33:17.090000000 +0000
+++ ceph-16.2.7.sw/src/boost/libs/log/build/log-architecture.jam 2022-05-26 11:09:13.010000000 +0000
@@ -65,6 +65,10 @@
diff -uprN ceph-ori/src/boost/libs/log/build/log-architecture.jam ceph-16.2.7/src/boost/libs/log/build/log-architecture.jam
--- ceph-ori/src/boost/libs/log/build/log-architecture.jam 2023-08-21 20:20:34.177094028 +0800
+++ ceph-16.2.7/src/boost/libs/log/build/log-architecture.jam 2023-08-21 20:20:53.637126734 +0800
@@ -65,6 +65,10 @@ rule deduce-architecture ( properties *
{
return <log-architecture>arm ;
}
@ -1770,9 +1758,9 @@ diff -Nuar ceph-16.2.7.org/src/boost/libs/log/build/log-architecture.jam ceph-16
else if [ configure.builds /boost/architecture//mips1 : $(properties) : mips1 ]
{
return <log-architecture>mips1 ;
diff -Nuar ceph-16.2.7.org/src/boost/tools/build/src/engine/jam.h ceph-16.2.7.sw/src/boost/tools/build/src/engine/jam.h
--- ceph-16.2.7.org/src/boost/tools/build/src/engine/jam.h 2022-05-23 15:33:14.890000000 +0000
+++ ceph-16.2.7.sw/src/boost/tools/build/src/engine/jam.h 2022-05-26 16:49:32.010000000 +0000
diff -uprN ceph-ori/src/boost/tools/build/src/engine/jam.h ceph-16.2.7/src/boost/tools/build/src/engine/jam.h
--- ceph-ori/src/boost/tools/build/src/engine/jam.h 2023-08-21 20:20:33.257092482 +0800
+++ ceph-16.2.7/src/boost/tools/build/src/engine/jam.h 2023-08-21 20:20:53.637126734 +0800
@@ -387,6 +387,11 @@
#define OSPLAT "OSPLAT=AXP"
#endif
@ -1785,10 +1773,10 @@ diff -Nuar ceph-16.2.7.org/src/boost/tools/build/src/engine/jam.h ceph-16.2.7.sw
#if defined( _i386_ ) || \
defined( __i386__ ) || \
defined( __i386 ) || \
diff -Nuar ceph-16.2.7.org/src/boost/tools/build/src/tools/builtin.py ceph-16.2.7.sw/src/boost/tools/build/src/tools/builtin.py
--- ceph-16.2.7.org/src/boost/tools/build/src/tools/builtin.py 2022-05-23 15:33:14.930000000 +0000
+++ ceph-16.2.7.sw/src/boost/tools/build/src/tools/builtin.py 2022-05-26 14:35:50.450000000 +0000
@@ -252,7 +252,10 @@
diff -uprN ceph-ori/src/boost/tools/build/src/tools/builtin.py ceph-16.2.7/src/boost/tools/build/src/tools/builtin.py
--- ceph-ori/src/boost/tools/build/src/tools/builtin.py 2023-08-21 20:20:33.269092502 +0800
+++ ceph-16.2.7/src/boost/tools/build/src/tools/builtin.py 2023-08-21 20:20:53.637126734 +0800
@@ -252,7 +252,10 @@ def register_globals ():
# x86 and x86-64
'x86',
@ -1800,7 +1788,7 @@ diff -Nuar ceph-16.2.7.org/src/boost/tools/build/src/tools/builtin.py ceph-16.2.
'ia64',
# Sparc
@@ -320,6 +323,9 @@
@@ -320,6 +323,9 @@ def register_globals ():
'armv2', 'armv2a', 'armv3', 'armv3m', 'armv4', 'armv4t', 'armv5',
'armv5t', 'armv5te', 'armv6', 'armv6j', 'iwmmxt', 'ep9312',
@ -1810,10 +1798,10 @@ diff -Nuar ceph-16.2.7.org/src/boost/tools/build/src/tools/builtin.py ceph-16.2.
# z Systems (aka s390x)
'z196', 'zEC12', 'z13', 'z13', 'z14', 'z15'],
diff -Nuar ceph-16.2.7.org/src/boost/tools/build/src/tools/features/architecture-feature.jam ceph-16.2.7.sw/src/boost/tools/build/src/tools/features/architecture-feature.jam
--- ceph-16.2.7.org/src/boost/tools/build/src/tools/features/architecture-feature.jam 2022-05-23 15:33:14.920000000 +0000
+++ ceph-16.2.7.sw/src/boost/tools/build/src/tools/features/architecture-feature.jam 2022-05-26 14:29:12.510000000 +0000
@@ -9,7 +9,7 @@
diff -uprN ceph-ori/src/boost/tools/build/src/tools/features/architecture-feature.jam ceph-16.2.7/src/boost/tools/build/src/tools/features/architecture-feature.jam
--- ceph-ori/src/boost/tools/build/src/tools/features/architecture-feature.jam 2023-08-21 20:20:33.265092496 +0800
+++ ceph-16.2.7/src/boost/tools/build/src/tools/features/architecture-feature.jam 2023-08-21 20:20:53.637126734 +0800
@@ -9,7 +9,7 @@ import feature ;
[[bbv2.builtin.features.architecture]]`architecture`::
*Allowed values:* `x86`, `ia64`, `sparc`, `power`, `mips1`, `mips2`,
@ -1822,7 +1810,7 @@ diff -Nuar ceph-16.2.7.org/src/boost/tools/build/src/tools/features/architecture
`s390x`, `combined`, `combined-x86-power`.
+
Specifies the general processor family to generate code for.
@@ -39,7 +39,10 @@
@@ -39,7 +39,10 @@ feature.feature architecture
# Advanced RISC Machines
arm
@ -1834,10 +1822,10 @@ diff -Nuar ceph-16.2.7.org/src/boost/tools/build/src/tools/features/architecture
riscv
# z Systems (aka s390x)
diff -Nuar ceph-16.2.7.org/src/CMakeLists.txt ceph-16.2.7.sw/src/CMakeLists.txt
--- ceph-16.2.7.org/src/CMakeLists.txt 2022-05-23 15:33:18.850000000 +0000
+++ ceph-16.2.7.sw/src/CMakeLists.txt 2022-05-26 14:39:09.230000000 +0000
@@ -70,7 +70,7 @@
diff -uprN ceph-ori/src/CMakeLists.txt ceph-16.2.7/src/CMakeLists.txt
--- ceph-ori/src/CMakeLists.txt 2023-08-21 20:20:34.209094082 +0800
+++ ceph-16.2.7/src/CMakeLists.txt 2023-08-21 20:20:53.637126734 +0800
@@ -70,7 +70,7 @@ if(CMAKE_CXX_COMPILER_ID STREQUAL GNU)
# The MINGW headers are missing some "const" qualifiers.
add_compile_options($<$<OR:$<COMPILE_LANGUAGE:C>,$<COMPILE_LANGUAGE:CXX>>:-fpermissive>)
else()
@ -1846,7 +1834,7 @@ diff -Nuar ceph-16.2.7.org/src/CMakeLists.txt ceph-16.2.7.sw/src/CMakeLists.txt
endif()
add_compile_options($<$<COMPILE_LANGUAGE:CXX>:-Wstrict-null-sentinel>)
add_compile_options($<$<COMPILE_LANGUAGE:CXX>:-Woverloaded-virtual>)
@@ -553,7 +553,7 @@
@@ -553,7 +553,7 @@ if(NOT APPLE AND NOT FREEBSD)
set_property(
TARGET ceph-common
APPEND APPEND_STRING

13
ceph.spec
View File

@ -129,7 +129,7 @@
#################################################################################
Name: ceph
Version: 16.2.7
Release: 21
Release: 22
%if 0%{?fedora} || 0%{?rhel} || 0%{?openEuler}
Epoch: 2
%endif
@ -154,7 +154,7 @@ Patch4: 0004-cmake-add-support-python-3.10.patch
Patch5: 0005-ceph-volume-lvm-api-function-no-undefined.patch
Patch6: 0006-ceph-volume-decrease-number-of-pvs-calls-in-lvm-list.patch
Patch7: 0007-bluestore-use-direct-write-for-bdevlabel.patch
Patch8: 0008-enable-sw64-architecture.patch
Patch8: 0008-cmake-enable-sw64-architecture.patch
Patch9: 0009-fix-CVE-2022-0670.patch
Patch10: 0010-fix-CVE-2022-3650.patch
Patch11: 0011-fix-no-module-named-v1_event-for-mgr-k8sevent.patch
@ -167,6 +167,7 @@ Patch17: 0017-mgr-dashboard-support-multi-language.patch
Patch18: 0018-Fix-Python-3.10-PEP-620-incompatibility.patch
Patch19: 0019-include-memory.patch
Patch20: 0020-compiled-with-gcc12.patch
Patch21: 0021-boost-enable-sw64-architecture.patch
%if 0%{?suse_version}
# _insert_obs_source_lines_here
ExclusiveArch: x86_64 aarch64 ppc64le s390x
@ -1231,9 +1232,8 @@ This package provides Ceph default alerts for Prometheus.
%prep
%autosetup -p1 -n ceph-16.2.7
%ifnarch loongarch64 sw_64
%patch13 -R -p1
%patch8 -R -p1
%ifnarch sw_64
%patch21 -R -p1
%endif
%if 0%{without mgr_dashboard_frontend_build_depend}
@ -2531,6 +2531,9 @@ exit 0
%config %{_sysconfdir}/prometheus/ceph/ceph_default_alerts.yml
%changelog
* Mon Aug 21 2023 liuqinfei <lucas.liuqinfei@huawei.com> - 2:16.2.7-22
- fix conflicts among multiple processor architectures
* Fri Jul 21 2023 wangzengliang <wangzengliang2@huawei.com> - 2:16.2.7-21
- Fix Python 3.10 <PEP 620> incompatibility