From 13fa69ddf904febdb4fe2b8c509a819c15f5bf49 Mon Sep 17 00:00:00 2001 From: "Kaleb S. KEITHLEY" Date: Wed, 6 Mar 2019 13:39:40 -0500 Subject: [PATCH] ceph 14.1.0 w/ static libcrc32 Signed-off-by: Kaleb S. KEITHLEY --- 0002-src-common-CMakeLists.txt.patch | 13 +++++++++++++ ceph.spec | 6 +++++- 2 files changed, 18 insertions(+), 1 deletion(-) create mode 100644 0002-src-common-CMakeLists.txt.patch diff --git a/0002-src-common-CMakeLists.txt.patch b/0002-src-common-CMakeLists.txt.patch new file mode 100644 index 0000000..e3252b3 --- /dev/null +++ b/0002-src-common-CMakeLists.txt.patch @@ -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}") diff --git a/ceph.spec b/ceph.spec index 0b82750..1f352ad 100644 --- a/ceph.spec +++ b/ceph.spec @@ -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 - 1:14.1.0-1 +- ceph 14.1.0 w/ static libcrc32 + * Wed Feb 27 2019 Boris Ranto - 1:14.1.0-1 - Rebase to v14.1.0 (updated for fixes in upstream nautilus branch)