rpms/ceph
3
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Rebuild for new fmt version.

Browse Source 
Signed-off-by: Kaleb S. KEITHLEY <kkeithle@redhat.com>
This commit is contained in:
Kaleb S. KEITHLEY 2021-07-07 10:39:57 -04:00
parent 65809728d6
commit f6c80111f0
2 changed files with 13 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
0013-src-common-Formatter.cc.patch Normal file
View File

@ -0,0 +1,10 @@
--- 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 {

4
ceph.spec
View File

@ -153,6 +153,7 @@ Patch0009: 0009-librgw-notifications-initialize-kafka-and-amqp.patch
Patch0010: 0010-os-bluestore-strip-trailing-slash-for-directory-list.patch Patch0010: 0010-os-bluestore-strip-trailing-slash-for-directory-list.patch
Patch0011: 0011-src-test-rgw-amqp_mock.cc.patch Patch0011: 0011-src-test-rgw-amqp_mock.cc.patch
Patch0012: 0012-src-compressor-snappy-SnappyCompressor.h.patch Patch0012: 0012-src-compressor-snappy-SnappyCompressor.h.patch
Patch0013: 0013-src-common-Formatter.cc.patch
# Source1: cmake-modules-BuildBoost.cmake.noautopatch # Source1: cmake-modules-BuildBoost.cmake.noautopatch
# ceph 14.0.1 does not support 32-bit architectures, bugs #1727788, #1727787 # ceph 14.0.1 does not support 32-bit architectures, bugs #1727788, #1727787
ExcludeArch: i686 armv7hl ExcludeArch: i686 armv7hl
@ -1299,7 +1300,7 @@ mkdir build
cd build cd build
%{cmake} .. \ %{cmake} .. \
-DCMAKE_BUILD_TYPE=RelWithDebInfo \ -DCMAKE_BUILD_TYPE=RelWithDebInfo \
-DCMAKE_COLOR_MAKEFILE=OFF \ -DCMAKE_COLOR_MAKEFILE:BOOL=OFF \
-DBUILD_CONFIG=rpmbuild \ -DBUILD_CONFIG=rpmbuild \
-DCMAKE_INSTALL_PREFIX=%{_prefix} \ -DCMAKE_INSTALL_PREFIX=%{_prefix} \
-DCMAKE_INSTALL_LIBDIR=%{_libdir} \ -DCMAKE_INSTALL_LIBDIR=%{_libdir} \
@ -1387,6 +1388,7 @@ cat ./CMakeFiles/CMakeError.log
export VERBOSE=1 export VERBOSE=1
export V=1 export V=1
export GCC_COLORS=
%cmake_build "$CEPH_MFLAGS_JOBS" %cmake_build "$CEPH_MFLAGS_JOBS"