Compare commits
18 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
| 40180d61e7 | |||
| 8d7cd94689 | |||
| ae54f50589 | |||
| d5d844e547 | |||
| e54974a235 | |||
| 0f382eb9c9 | |||
| b81df99ea4 | |||
| 454fb3d60d | |||
| 897c4bbb15 | |||
| dc4aea2520 | |||
| e2514bc7b0 | |||
| 768e30a6d6 | |||
| 38d866465a | |||
| 4e33e003a1 | |||
| bb9f0b064d | |||
| a7086b93e9 | |||
| d2d8b52247 | |||
| da844afb90 |
@@ -1,2 +0,0 @@
|
||||
ceph-*.tar.*
|
||||
*.src.rpm
|
||||
@@ -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,26 +0,0 @@
|
||||
<<<<<<< HEAD
|
||||
--- ceph-15.1.0/src/common/bit_str.h.orig 2020-02-03 09:47:20.047149798 -0500
|
||||
+++ ceph-15.1.0/src/common/bit_str.h 2020-02-03 09:47:50.213149798 -0500
|
||||
=======
|
||||
--- ceph-14.2.6/src/common/bit_str.h.orig 2020-01-24 11:37:20.547679336 -0500
|
||||
+++ ceph-14.2.6/src/common/bit_str.h 2020-01-24 11:37:55.351904895 -0500
|
||||
>>>>>>> origin/f32
|
||||
@@ -17,6 +17,7 @@
|
||||
#include <cstdint>
|
||||
#include <iosfwd>
|
||||
#include <functional>
|
||||
+#include <ostream>
|
||||
|
||||
namespace ceph {
|
||||
class Formatter;
|
||||
--- ceph-15.2.4/src/global/signal_handler.h.orig 2020-07-17 12:57:54.763628429 -0400
|
||||
+++ ceph-15.2.4/src/global/signal_handler.h 2020-07-17 12:58:10.610628429 -0400
|
||||
@@ -16,6 +16,8 @@
|
||||
#define CEPH_GLOBAL_SIGNAL_HANDLER_H
|
||||
|
||||
#include <signal.h>
|
||||
+#include <string>
|
||||
+
|
||||
#include "acconfig.h"
|
||||
|
||||
typedef void (*signal_handler_t)(int);
|
||||
@@ -0,0 +1 @@
|
||||
outdated version, no longer supported on el6, obsoleted by packages for el7 in CentOS Storage SIG
|
||||
Reference in New Issue
Block a user