sys-cluster/ceph: revbumps, fix build with cython-29 (bug 682482)

Closes: https://bugs.gentoo.org/682482
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-13.2.5-r1.ebuild b/sys-cluster/ceph/ceph-13.2.5-r2.ebuild
similarity index 99%
rename from sys-cluster/ceph/ceph-13.2.5-r1.ebuild
rename to sys-cluster/ceph/ceph-13.2.5-r2.ebuild
index 7d088a08ac607abd9ba53da7e2a58174ce13dd63..2ef0f19a401065a176abb1aaec30c612dbab12cc 100644 (file)
--- a/sys-cluster/ceph/ceph-13.2.5-r1.ebuild
+++ b/sys-cluster/ceph/ceph-13.2.5-r2.ebuild
@@ -147,6 +147,7 @@ PATCHES=(
        "${FILESDIR}/ceph-13.2.0-no-virtualenvs.patch"
        "${FILESDIR}/ceph-13.2.2-dont-install-sysvinit-script.patch"
        "${FILESDIR}/ceph-13.2.5-no-automagic-deps.patch"
+       "${FILESDIR}/ceph-14.2.0-cython-0.29.patch"
 )
 
 check-reqs_export_vars() {

diff --git a/sys-cluster/ceph/ceph-14.2.0-r3.ebuild b/sys-cluster/ceph/ceph-14.2.0-r4.ebuild
similarity index 99%
rename from sys-cluster/ceph/ceph-14.2.0-r3.ebuild
rename to sys-cluster/ceph/ceph-14.2.0-r4.ebuild
index 01499ef0ffe872b546d374513da4575b0765b6e1..61c4b21e9f8b810e3e782ccf747aff92881685ab 100644 (file)
--- a/sys-cluster/ceph/ceph-14.2.0-r3.ebuild
+++ b/sys-cluster/ceph/ceph-14.2.0-r4.ebuild
@@ -150,6 +150,7 @@ PATCHES=(
        "${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"
+       "${FILESDIR}/ceph-14.2.0-cython-0.29.patch"
 )
 
 # dpdk and ninja don't get along

diff --git a/sys-cluster/ceph/files/ceph-14.2.0-cython-0.29.patch b/sys-cluster/ceph/files/ceph-14.2.0-cython-0.29.patch
new file mode 100644 (file)
index 0000000..be133c1
--- /dev/null
+++ b/sys-cluster/ceph/files/ceph-14.2.0-cython-0.29.patch
@@ -0,0 +1,17 @@
+--- ceph-13.2.1/cmake/modules/Distutils.cmake.old      2018-07-26 17:39:56.000000000 -0000
++++ ceph-13.2.1/cmake/modules/Distutils.cmake  2018-12-24 05:43:51.566174070 -0000
+@@ -58,8 +62,13 @@
+ function(distutils_install_cython_module name)
+   get_property(compiler_launcher GLOBAL PROPERTY RULE_LAUNCH_COMPILE)
+   get_property(link_launcher GLOBAL PROPERTY RULE_LAUNCH_LINK)
+-  set(PY_CC "${compiler_launcher} ${CMAKE_C_COMPILER}")
++  string(REPLACE " " ";" cflags ${CMAKE_C_FLAGS})
++  list(APPEND cflags -iquote${CMAKE_SOURCE_DIR}/src/include -w)
++  list(APPEND cflags -D'void0=dead_function\(void\)')
++  list(APPEND cflags -D'__Pyx_check_single_interpreter\(ARG\)=ARG \#\# 0')
++  string(REPLACE ";" " " cflags "${cflags}")
++  set(PY_CC "${compiler_launcher} ${CMAKE_C_COMPILER} ${cflags}")
+   set(PY_LDSHARED "${link_launcher} ${CMAKE_C_COMPILER} -shared")
+   install(CODE "
+     set(ENV{CC} \"${PY_CC}\")
+     set(ENV{LDSHARED} \"${PY_LDSHARED}\")