| 1 |
commit: 84f2bdae597f394425b96329fc8305d9b729f782 |
| 2 |
Author: Patrick McLean <patrick.mclean <AT> sony <DOT> com> |
| 3 |
AuthorDate: Fri Apr 5 01:45:22 2019 +0000 |
| 4 |
Commit: Patrick McLean <chutzpah <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Fri Apr 5 01:47:56 2019 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=84f2bdae |
| 7 |
|
| 8 |
sys-cluster/ceph: revbumps, fix build with cython-29 (bug 682482) |
| 9 |
|
| 10 |
Closes: https://bugs.gentoo.org/682482 |
| 11 |
Copyright: Sony Interactive Entertainment Inc. |
| 12 |
Package-Manager: Portage-2.3.62, Repoman-2.3.12 |
| 13 |
Signed-off-by: Patrick McLean <chutzpah <AT> gentoo.org> |
| 14 |
|
| 15 |
.../{ceph-13.2.5-r1.ebuild => ceph-13.2.5-r2.ebuild} | 1 + |
| 16 |
.../{ceph-14.2.0-r3.ebuild => ceph-14.2.0-r4.ebuild} | 1 + |
| 17 |
sys-cluster/ceph/files/ceph-14.2.0-cython-0.29.patch | 17 +++++++++++++++++ |
| 18 |
3 files changed, 19 insertions(+) |
| 19 |
|
| 20 |
diff --git a/sys-cluster/ceph/ceph-13.2.5-r1.ebuild b/sys-cluster/ceph/ceph-13.2.5-r2.ebuild |
| 21 |
similarity index 99% |
| 22 |
rename from sys-cluster/ceph/ceph-13.2.5-r1.ebuild |
| 23 |
rename to sys-cluster/ceph/ceph-13.2.5-r2.ebuild |
| 24 |
index 7d088a08ac6..2ef0f19a401 100644 |
| 25 |
--- a/sys-cluster/ceph/ceph-13.2.5-r1.ebuild |
| 26 |
+++ b/sys-cluster/ceph/ceph-13.2.5-r2.ebuild |
| 27 |
@@ -147,6 +147,7 @@ PATCHES=( |
| 28 |
"${FILESDIR}/ceph-13.2.0-no-virtualenvs.patch" |
| 29 |
"${FILESDIR}/ceph-13.2.2-dont-install-sysvinit-script.patch" |
| 30 |
"${FILESDIR}/ceph-13.2.5-no-automagic-deps.patch" |
| 31 |
+ "${FILESDIR}/ceph-14.2.0-cython-0.29.patch" |
| 32 |
) |
| 33 |
|
| 34 |
check-reqs_export_vars() { |
| 35 |
|
| 36 |
diff --git a/sys-cluster/ceph/ceph-14.2.0-r3.ebuild b/sys-cluster/ceph/ceph-14.2.0-r4.ebuild |
| 37 |
similarity index 99% |
| 38 |
rename from sys-cluster/ceph/ceph-14.2.0-r3.ebuild |
| 39 |
rename to sys-cluster/ceph/ceph-14.2.0-r4.ebuild |
| 40 |
index 01499ef0ffe..61c4b21e9f8 100644 |
| 41 |
--- a/sys-cluster/ceph/ceph-14.2.0-r3.ebuild |
| 42 |
+++ b/sys-cluster/ceph/ceph-14.2.0-r4.ebuild |
| 43 |
@@ -150,6 +150,7 @@ PATCHES=( |
| 44 |
"${FILESDIR}/ceph-13.2.2-dont-install-sysvinit-script.patch" |
| 45 |
"${FILESDIR}/ceph-14.2.0-dpdk-cflags.patch" |
| 46 |
"${FILESDIR}/ceph-14.2.0-link-crc32-statically.patch" |
| 47 |
+ "${FILESDIR}/ceph-14.2.0-cython-0.29.patch" |
| 48 |
) |
| 49 |
|
| 50 |
# dpdk and ninja don't get along |
| 51 |
|
| 52 |
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 |
| 53 |
new file mode 100644 |
| 54 |
index 00000000000..be133c121d0 |
| 55 |
--- /dev/null |
| 56 |
+++ b/sys-cluster/ceph/files/ceph-14.2.0-cython-0.29.patch |
| 57 |
@@ -0,0 +1,17 @@ |
| 58 |
+--- ceph-13.2.1/cmake/modules/Distutils.cmake.old 2018-07-26 17:39:56.000000000 -0000 |
| 59 |
++++ ceph-13.2.1/cmake/modules/Distutils.cmake 2018-12-24 05:43:51.566174070 -0000 |
| 60 |
+@@ -58,8 +62,13 @@ |
| 61 |
+ function(distutils_install_cython_module name) |
| 62 |
+ get_property(compiler_launcher GLOBAL PROPERTY RULE_LAUNCH_COMPILE) |
| 63 |
+ get_property(link_launcher GLOBAL PROPERTY RULE_LAUNCH_LINK) |
| 64 |
+- set(PY_CC "${compiler_launcher} ${CMAKE_C_COMPILER}") |
| 65 |
++ string(REPLACE " " ";" cflags ${CMAKE_C_FLAGS}) |
| 66 |
++ list(APPEND cflags -iquote${CMAKE_SOURCE_DIR}/src/include -w) |
| 67 |
++ list(APPEND cflags -D'void0=dead_function\(void\)') |
| 68 |
++ list(APPEND cflags -D'__Pyx_check_single_interpreter\(ARG\)=ARG \#\# 0') |
| 69 |
++ string(REPLACE ";" " " cflags "${cflags}") |
| 70 |
++ set(PY_CC "${compiler_launcher} ${CMAKE_C_COMPILER} ${cflags}") |
| 71 |
+ set(PY_LDSHARED "${link_launcher} ${CMAKE_C_COMPILER} -shared") |
| 72 |
+ install(CODE " |
| 73 |
+ set(ENV{CC} \"${PY_CC}\") |
| 74 |
+ set(ENV{LDSHARED} \"${PY_LDSHARED}\") |
Archives