rm obsolete patches
This commit is contained in:
parent
45693aab3a
commit
dcb9370e41
|
@ -1,13 +0,0 @@
|
|||
diff --git a/src/common/CMakeLists.txt b/src/common/CMakeLists.txt
|
||||
index 65ba10b0f1..eeedc29c37 100644
|
||||
--- a/src/common/CMakeLists.txt
|
||||
+++ b/src/common/CMakeLists.txt
|
||||
@@ -165,7 +165,7 @@ elseif(HAVE_ARMV8_CRC)
|
||||
crc32c_aarch64.c)
|
||||
endif(HAVE_INTEL)
|
||||
|
||||
-add_library(crc32 ${crc32_srcs})
|
||||
+add_library(crc32 STATIC ${crc32_srcs})
|
||||
if(HAVE_ARMV8_CRC)
|
||||
set_target_properties(crc32 PROPERTIES
|
||||
COMPILE_FLAGS "${CMAKE_C_FLAGS} ${ARMV8_CRC_COMPILE_FLAGS}")
|
|
@ -1,11 +0,0 @@
|
|||
--- ceph-16.1.0-43-g6b74fb5c/src/blk/CMakeLists.txt.orig 2021-02-01 08:16:26.719517641 -0500
|
||||
+++ ceph-16.1.0-43-g6b74fb5c/src/blk/CMakeLists.txt 2021-02-01 08:16:47.810092341 -0500
|
||||
@@ -25,7 +25,7 @@
|
||||
zoned/HMSMRDevice.cc)
|
||||
endif()
|
||||
|
||||
-add_library(blk ${libblk_srcs})
|
||||
+add_library(blk STATIC ${libblk_srcs})
|
||||
target_include_directories(blk PRIVATE "./")
|
||||
|
||||
if(HAVE_LIBAIO)
|
|
@ -1,11 +0,0 @@
|
|||
--- ceph-16.1.0-43-g6b74fb5c/src/test/neorados/CMakeLists.txt.orig 2021-02-01 08:25:18.006965821 -0500
|
||||
+++ ceph-16.1.0-43-g6b74fb5c/src/test/neorados/CMakeLists.txt 2021-02-01 08:25:34.244407147 -0500
|
||||
@@ -19,7 +19,7 @@
|
||||
target_link_libraries(ceph_test_neorados_op_speed
|
||||
libneorados fmt::fmt ${unittest_libs})
|
||||
|
||||
-add_library(neoradostest-support common_tests.cc)
|
||||
+add_library(neoradostest-support STATIC common_tests.cc)
|
||||
target_link_libraries(neoradostest-support
|
||||
libneorados fmt::fmt)
|
||||
|
|
@ -1,23 +0,0 @@
|
|||
--- a/src/test/rgw/amqp_mock.cc
|
||||
+++ b/src/test/rgw/amqp_mock.cc
|
||||
@@ -291,7 +291,11 @@ amqp_confirm_select_ok_t* amqp_confirm_select(amqp_connection_state_t state, amq
|
||||
return state->confirm;
|
||||
}
|
||||
|
||||
-int amqp_simple_wait_frame_noblock(amqp_connection_state_t state, amqp_frame_t *decoded_frame, struct timeval* tv) {
|
||||
+extern "C" {
|
||||
+
|
||||
+int amqp_simple_wait_frame_noblock(amqp_connection_state_t state,
|
||||
+ amqp_frame_t *decoded_frame,
|
||||
+ const struct timeval* tv) {
|
||||
if (state->socket && state->socket->open_called &&
|
||||
state->login_called && state->channel1 && state->channel2 && state->exchange &&
|
||||
state->queue && state->consume && state->confirm && !FAIL_NEXT_READ) {
|
||||
@@ -345,6 +349,7 @@ int amqp_simple_wait_frame_noblock(amqp_connection_state_t state, amqp_frame_t *
|
||||
}
|
||||
return AMQP_STATUS_CONNECTION_CLOSED;
|
||||
}
|
||||
+} // extern "C"
|
||||
|
||||
amqp_basic_consume_ok_t* amqp_basic_consume(
|
||||
amqp_connection_state_t state, amqp_channel_t channel, amqp_bytes_t queue,
|
|
@ -1,11 +0,0 @@
|
|||
--- ceph-16.2.4/src/compressor/snappy/SnappyCompressor.h.orig 2021-05-26 08:30:26.205447315 -0400
|
||||
+++ ceph-16.2.4/src/compressor/snappy/SnappyCompressor.h 2021-05-26 08:31:22.570443033 -0400
|
||||
@@ -97,7 +97,7 @@
|
||||
if (qat_enabled)
|
||||
return qat_accel.decompress(p, compressed_len, dst, compressor_message);
|
||||
#endif
|
||||
- snappy::uint32 res_len = 0;
|
||||
+ std::uint32_t res_len = 0;
|
||||
BufferlistSource source_1(p, compressed_len);
|
||||
if (!snappy::GetUncompressedLength(&source_1, &res_len)) {
|
||||
return -1;
|
|
@ -1,10 +0,0 @@
|
|||
--- ceph-16.2.4/src/common/Formatter.cc.orig 2021-07-07 09:32:25.513818420 -0400
|
||||
+++ ceph-16.2.4/src/common/Formatter.cc 2021-07-07 09:44:42.007373294 -0400
|
||||
@@ -21,6 +21,7 @@
|
||||
#include <fmt/format.h>
|
||||
#include <set>
|
||||
#include <limits>
|
||||
+#include <algorithm>
|
||||
|
||||
// -----------------------
|
||||
namespace ceph {
|
Loading…
Reference in New Issue