Compare commits
2 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
| eb28854f14 | |||
| 0de8065f06 |
@@ -0,0 +1,47 @@
|
||||
From 2a7810f39cb113570efcde5f65e5440ff9587ae0 Mon Sep 17 00:00:00 2001
|
||||
From: Boris Ranto <branto@redhat.com>
|
||||
Date: Wed, 11 Nov 2015 17:08:06 +0100
|
||||
Subject: [PATCH] Disable erasure_codelib neon build
|
||||
|
||||
---
|
||||
src/erasure-code/jerasure/Makefile.am | 6 +++---
|
||||
src/erasure-code/shec/Makefile.am | 6 +++---
|
||||
2 files changed, 6 insertions(+), 6 deletions(-)
|
||||
|
||||
diff --git a/src/erasure-code/jerasure/Makefile.am b/src/erasure-code/jerasure/Makefile.am
|
||||
index 6ffe3ed..01f5112 100644
|
||||
--- a/src/erasure-code/jerasure/Makefile.am
|
||||
+++ b/src/erasure-code/jerasure/Makefile.am
|
||||
@@ -75,9 +75,9 @@ if LINUX
|
||||
libec_jerasure_neon_la_LDFLAGS += -export-symbols-regex '.*__erasure_code_.*'
|
||||
endif
|
||||
|
||||
-if HAVE_NEON
|
||||
-erasure_codelib_LTLIBRARIES += libec_jerasure_neon.la
|
||||
-endif
|
||||
+#if HAVE_NEON
|
||||
+#erasure_codelib_LTLIBRARIES += libec_jerasure_neon.la
|
||||
+#endif
|
||||
|
||||
libec_jerasure_sse3_la_SOURCES = ${jerasure_sources}
|
||||
libec_jerasure_sse3_la_CFLAGS = ${AM_CFLAGS} \
|
||||
diff --git a/src/erasure-code/shec/Makefile.am b/src/erasure-code/shec/Makefile.am
|
||||
index cd93132..948979b 100644
|
||||
--- a/src/erasure-code/shec/Makefile.am
|
||||
+++ b/src/erasure-code/shec/Makefile.am
|
||||
@@ -81,9 +81,9 @@ if LINUX
|
||||
libec_shec_neon_la_LDFLAGS += -export-symbols-regex '.*__erasure_code_.*'
|
||||
endif
|
||||
|
||||
-if HAVE_NEON
|
||||
-erasure_codelib_LTLIBRARIES += libec_shec_neon.la
|
||||
-endif
|
||||
+#if HAVE_NEON
|
||||
+#erasure_codelib_LTLIBRARIES += libec_shec_neon.la
|
||||
+#endif
|
||||
|
||||
libec_shec_sse3_la_SOURCES = ${shec_sources}
|
||||
libec_shec_sse3_la_CFLAGS = ${AM_CFLAGS} \
|
||||
--
|
||||
2.7.4
|
||||
|
||||
@@ -0,0 +1,33 @@
|
||||
From 69e888fa5c103588ee9f23ac4cec4bfc2285eb08 Mon Sep 17 00:00:00 2001
|
||||
From: Boris Ranto <branto@redhat.com>
|
||||
Date: Fri, 13 Jan 2017 01:15:42 +0100
|
||||
Subject: [PATCH] hack: do not test for libxfs, assume it is present
|
||||
|
||||
---
|
||||
configure.ac | 3 ++-
|
||||
1 file changed, 2 insertions(+), 1 deletion(-)
|
||||
|
||||
diff --git a/configure.ac b/configure.ac
|
||||
index 32e273f..050e754 100644
|
||||
--- a/configure.ac
|
||||
+++ b/configure.ac
|
||||
@@ -882,7 +882,7 @@ AC_ARG_WITH([libxfs],
|
||||
[AS_HELP_STRING([--without-libxfs], [disable libxfs use by FileStore])],
|
||||
[],
|
||||
[with_libxfs=yes])
|
||||
-AS_IF([test "x$with_libxfs" != "xno"], [
|
||||
+AS_IF([test "x$with_libxfs" = "hack..."], [
|
||||
# xfs/xfs.h presence and XFS_XFLAG_EXTSIZE define
|
||||
AC_CHECK_HEADER([xfs/xfs.h], [], AC_MSG_ERROR(
|
||||
[xfs/xfs.h not found (--without-libxfs to disable)]))
|
||||
@@ -900,6 +900,7 @@ AS_IF([test "x$with_libxfs" != "xno"], [
|
||||
AC_MSG_ERROR([XFS_XFLAG_EXTSIZE not found (--without-libxfs to disable)])
|
||||
])
|
||||
])
|
||||
+AC_DEFINE([HAVE_LIBXFS], [1], [Define to 1 if you have libxfs])
|
||||
AM_CONDITIONAL(WITH_LIBXFS, [test "x$with_libxfs" != "xno"])
|
||||
|
||||
# use libzfs
|
||||
--
|
||||
2.7.4
|
||||
|
||||
@@ -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}")
|
||||
@@ -0,0 +1,25 @@
|
||||
From b204da4e28a0238547c99ee1bf4080ae4d62ad33 Mon Sep 17 00:00:00 2001
|
||||
From: Boris Ranto <branto@redhat.com>
|
||||
Date: Wed, 8 Feb 2017 22:38:12 +0100
|
||||
Subject: [PATCH] librbd/Journal: include WorkQueue since we use it
|
||||
|
||||
Signed-off-by: Boris Ranto <branto@redhat.com>
|
||||
---
|
||||
src/librbd/Journal.h | 1 +
|
||||
1 file changed, 1 insertion(+)
|
||||
|
||||
diff --git a/src/librbd/Journal.h b/src/librbd/Journal.h
|
||||
index 4b70b99..2490975 100644
|
||||
--- a/src/librbd/Journal.h
|
||||
+++ b/src/librbd/Journal.h
|
||||
@@ -11,6 +11,7 @@
|
||||
#include "common/Cond.h"
|
||||
#include "common/Mutex.h"
|
||||
#include "common/Cond.h"
|
||||
+#include "common/WorkQueue.h"
|
||||
#include "journal/Future.h"
|
||||
#include "journal/JournalMetadataListener.h"
|
||||
#include "journal/ReplayEntry.h"
|
||||
--
|
||||
2.9.3
|
||||
|
||||
@@ -1,13 +0,0 @@
|
||||
--- 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
|
||||
@@ -14,7 +14,10 @@
|
||||
#ifndef CEPH_COMMON_BIT_STR_H
|
||||
#define CEPH_COMMON_BIT_STR_H
|
||||
|
||||
+#include <cstdint>
|
||||
+#include <iosfwd>
|
||||
#include <functional>
|
||||
+#include <ostream>
|
||||
|
||||
namespace ceph {
|
||||
class Formatter;
|
||||
@@ -1,10 +0,0 @@
|
||||
--- ceph-14.2.6/src/librbd/api/PoolMetadata.h.orig 2020-01-24 12:39:23.738816885 -0500
|
||||
+++ ceph-14.2.6/src/librbd/api/PoolMetadata.h 2020-01-24 12:39:36.522902386 -0500
|
||||
@@ -8,6 +8,7 @@
|
||||
#include "include/rados/librados_fwd.hpp"
|
||||
|
||||
#include <map>
|
||||
+#include <string>
|
||||
|
||||
namespace librbd {
|
||||
|
||||
@@ -1,39 +0,0 @@
|
||||
--- a/cmake/modules/CheckCxxAtomic.cmake 2020-03-02 12:49:20.000000000 -0500
|
||||
+++ b/cmake/modules/CheckCxxAtomic.cmake 2020-01-29 12:53:56.952149798 -0500
|
||||
@@ -10,18 +10,29 @@
|
||||
check_cxx_source_compiles("
|
||||
#include <atomic>
|
||||
#include <cstdint>
|
||||
+
|
||||
+#if __s390x__
|
||||
+// 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
|
||||
+// library routines otherwise. Whether or not alignment is provably
|
||||
+// OK for a std::atomic unfortunately depends on compiler version and
|
||||
+// optimization levels, and also on the details of the expression.
|
||||
+// We specifically test access via an otherwise unknown pointer here
|
||||
+// to ensure we get the most complex case. If this access can be
|
||||
+// done without libatomic, then all accesses can be done.
|
||||
+bool atomic16(std::atomic<unsigned __int128> *ptr)
|
||||
+{
|
||||
+ return *ptr != 0;
|
||||
+}
|
||||
+#endif
|
||||
+
|
||||
int main() {
|
||||
std::atomic<uint8_t> w1;
|
||||
std::atomic<uint16_t> w2;
|
||||
std::atomic<uint32_t> w4;
|
||||
std::atomic<uint64_t> w8;
|
||||
-#ifdef __s390x__
|
||||
- // Boost needs 16-byte atomics for tagged pointers.
|
||||
- std::atomic<unsigned __int128> w16;
|
||||
-#else
|
||||
- #define w16 0
|
||||
-#endif
|
||||
- return w1 + w2 + w4 + w8 + w16;
|
||||
+ return w1 + w2 + w4 + w8;
|
||||
}
|
||||
" ${var})
|
||||
endfunction(check_cxx_atomics)
|
||||
@@ -1 +1 @@
|
||||
SHA512 (ceph-14.2.9.tar.gz) = 0a26372d0037c32fe1d24be880e272fcce5089b02adfb0e791e0406155f6e66c913fa43762028f49c1fa3f30c6c8d819c521dd11702a37cc7040dfd3097c068e
|
||||
SHA512 (ceph-10.2.7.tar.gz) = 7e0686e9efa4ddd9d548f4145b448f8232f1ca29b08428daa5cd60a74ce26f1176a1f2ebbf2ac1761d9e6c1d364a5ffa194d2b3a18a8111f59b7c27f7a1d7734
|
||||
|
||||
Reference in New Issue
Block a user