ceph 14.1.0 w/ static libcrc32

Signed-off-by: Kaleb S. KEITHLEY <kkeithle@redhat.com>
This commit is contained in:
Kaleb S. KEITHLEY 2019-03-06 13:39:40 -05:00
parent 315d3a8c86
commit 13fa69ddf9
2 changed files with 18 additions and 1 deletions

View File

@ -0,0 +1,13 @@
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}")

View File

@ -104,7 +104,7 @@
#################################################################################
Name: ceph
Version: 14.1.0
Release: 1%{?dist}
Release: 2%{?dist}
%if 0%{?fedora} || 0%{?rhel}
Epoch: 1
%endif
@ -121,6 +121,7 @@ Group: System/Filesystems
URL: http://ceph.com/
Source0: %{?_remote_tarball_prefix}ceph-%{version}.tar.bz2
Patch001: 0001-s390x-A-compile-hack.patch
Patch002: 0002-src-common-CMakeLists.txt.patch
ExcludeArch: i686 armv7hl
#################################################################################
# dependencies that apply across all distro families
@ -2169,6 +2170,9 @@ exit 0
%changelog
* Wed Mar 6 2019 Kaleb S. KEITHLEY <kkeithle[at]redhat.com> - 1:14.1.0-1
- ceph 14.1.0 w/ static libcrc32
* Wed Feb 27 2019 Boris Ranto <branto@redhat.com> - 1:14.1.0-1
- Rebase to v14.1.0 (updated for fixes in upstream nautilus branch)