sys-cluster/ceph: revbump 14.2.0-r1 static crc32 fork (bug #681216)

Statically link internal crc32 fork to avoid collisions and runtime
errors.

Closes: https://bugs.gentoo.org/681216
Copyright: Sony Interactive Entertainment Inc.
Package-Manager: Portage-2.3.62, Repoman-2.3.12
Signed-off-by: Patrick McLean <chutzpah@gentoo.org>

diff --git a/sys-cluster/ceph/ceph-14.2.0-r1.ebuild b/sys-cluster/ceph/ceph-14.2.0-r2.ebuild
similarity index 98%
rename from sys-cluster/ceph/ceph-14.2.0-r1.ebuild
rename to sys-cluster/ceph/ceph-14.2.0-r2.ebuild
index 868ca8e9fd715b9850a5e972b2927b466c15e2f8..d318002040a002497d5a465337ec3bf21077ec50 100644 (file)
--- a/sys-cluster/ceph/ceph-14.2.0-r1.ebuild
+++ b/sys-cluster/ceph/ceph-14.2.0-r2.ebuild
@@ -38,6 +38,7 @@ COMMON_DEPEND="
        app-arch/snappy:=[static-libs?]
        app-arch/zstd:=[static-libs?]
        app-misc/jq:=[static-libs?]
+       dev-libs/crc32c:=
        dev-libs/crypto++:=[static-libs?]
        dev-libs/leveldb:=[snappy,static-libs?,tcmalloc?]
        dev-libs/libaio:=[static-libs?]
@@ -149,6 +150,7 @@ PATCHES=(
        "${FILESDIR}/ceph-14.2.0-no-virtualenvs.patch"
        "${FILESDIR}/ceph-13.2.2-dont-install-sysvinit-script.patch"
        "${FILESDIR}/ceph-14.2.0-dpdk-cflags.patch"
+       "${FILESDIR}/ceph-14.2.0-link-crc32-statically.patch"
 )
 
 # dpdk and ninja don't get along
@@ -228,7 +230,7 @@ ceph_src_configure() {
                -DWITH_TBB=no
                -DSYSTEMD_UNITDIR=$(systemd_get_systemunitdir)
                -DEPYTHON_VERSION="${EPYTHON#python}"
-               -DCMAKE_INSTALL_DOCDIR="${EPREFIX}/usr/share/doc/${P}"
+               -DCMAKE_INSTALL_DOCDIR="${EPREFIX}/usr/share/doc/${PN}"
                -DCMAKE_INSTALL_SYSCONFDIR="${EPREFIX}/etc"
                -Wno-dev
        )

diff --git a/sys-cluster/ceph/files/ceph-14.2.0-link-crc32-statically.patch b/sys-cluster/ceph/files/ceph-14.2.0-link-crc32-statically.patch
new file mode 100644 (file)
index 0000000..ec7a4fb
--- /dev/null
+++ b/sys-cluster/ceph/files/ceph-14.2.0-link-crc32-statically.patch
@@ -0,0 +1,11 @@
+--- ceph-14.2.0.orig/src/common/CMakeLists.txt 2019-03-18 04:08:29.000000000 -0600
++++ ceph-14.2.0/src/common/CMakeLists.txt      2019-03-21 18:42:32.903182824 -0600
+@@ -165,7 +165,7 @@
+     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}")