| 1 |
commit: c588d0c55a2facb7b98331abf3ccb2439cc34286 |
| 2 |
Author: Patrick McLean <chutzpah <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Wed Aug 24 17:06:28 2022 +0000 |
| 4 |
Commit: Patrick McLean <chutzpah <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Wed Aug 24 17:06:28 2022 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c588d0c5 |
| 7 |
|
| 8 |
sys-cluster/ceph: Fix CI bugs 866159, 866161, 866163, 866167 |
| 9 |
|
| 10 |
Closes: https://bugs.gentoo.org/866159 |
| 11 |
Closes: https://bugs.gentoo.org/866161 |
| 12 |
Closes: https://bugs.gentoo.org/866163 |
| 13 |
Closes: https://bugs.gentoo.org/866167 |
| 14 |
Signed-off-by: Patrick McLean <chutzpah <AT> gentoo.org> |
| 15 |
|
| 16 |
.../{ceph-17.2.3-r2.ebuild => ceph-17.2.3-r3.ebuild} | 9 +++++++++ |
| 17 |
sys-cluster/ceph/files/ceph-17.2.3-flags.patch | 19 +++++++++++++++++++ |
| 18 |
2 files changed, 28 insertions(+) |
| 19 |
|
| 20 |
diff --git a/sys-cluster/ceph/ceph-17.2.3-r2.ebuild b/sys-cluster/ceph/ceph-17.2.3-r3.ebuild |
| 21 |
similarity index 98% |
| 22 |
rename from sys-cluster/ceph/ceph-17.2.3-r2.ebuild |
| 23 |
rename to sys-cluster/ceph/ceph-17.2.3-r3.ebuild |
| 24 |
index c31770f38434..a604240f1560 100644 |
| 25 |
--- a/sys-cluster/ceph/ceph-17.2.3-r2.ebuild |
| 26 |
+++ b/sys-cluster/ceph/ceph-17.2.3-r3.ebuild |
| 27 |
@@ -219,6 +219,7 @@ PATCHES=( |
| 28 |
"${FILESDIR}/ceph-17.2.3-gcc12.patch" |
| 29 |
"${FILESDIR}/ceph-17.2.0-gcc12-dout.patch" |
| 30 |
"${FILESDIR}/ceph-17.2.0-gcc12-header.patch" |
| 31 |
+ "${FILESDIR}/ceph-17.2.3-flags.patch" |
| 32 |
) |
| 33 |
|
| 34 |
check-reqs_export_vars() { |
| 35 |
@@ -330,6 +331,9 @@ ceph_src_configure() { |
| 36 |
else |
| 37 |
mycmakeargs+=( |
| 38 |
-DWITH_RADOSGW_SELECT_PARQUET:BOOL=OFF |
| 39 |
+ -DWITH_JAEGER:BOOL=OFF |
| 40 |
+ # don't want to warn about unused CLI when reconfiguring for python |
| 41 |
+ -DCMAKE_WARN_UNUSED_CLI:BOOL=OFF |
| 42 |
) |
| 43 |
fi |
| 44 |
|
| 45 |
@@ -396,6 +400,7 @@ src_install() { |
| 46 |
|
| 47 |
python_setup |
| 48 |
cmake_src_install |
| 49 |
+ python_optimize |
| 50 |
|
| 51 |
find "${ED}" -name '*.la' -type f -delete || die |
| 52 |
|
| 53 |
@@ -460,3 +465,7 @@ pkg_postinst() { |
| 54 |
tmpfiles_process ${PN}.conf |
| 55 |
udev_reload |
| 56 |
} |
| 57 |
+ |
| 58 |
+pkg_postrm() { |
| 59 |
+ udev_reload |
| 60 |
+} |
| 61 |
|
| 62 |
diff --git a/sys-cluster/ceph/files/ceph-17.2.3-flags.patch b/sys-cluster/ceph/files/ceph-17.2.3-flags.patch |
| 63 |
new file mode 100644 |
| 64 |
index 000000000000..236ff5441831 |
| 65 |
--- /dev/null |
| 66 |
+++ b/sys-cluster/ceph/files/ceph-17.2.3-flags.patch |
| 67 |
@@ -0,0 +1,19 @@ |
| 68 |
+diff --git a/cmake/modules/Distutils.cmake b/cmake/modules/Distutils.cmake |
| 69 |
+index 1916363382f..ae460d84542 100644 |
| 70 |
+--- a/cmake/modules/Distutils.cmake |
| 71 |
++++ b/cmake/modules/Distutils.cmake |
| 72 |
+@@ -94,12 +94,12 @@ function(distutils_add_cython_module target name src) |
| 73 |
+ COMMAND |
| 74 |
+ env |
| 75 |
+ CC="${PY_CC}" |
| 76 |
+- CFLAGS="${PY_CFLAGS}" |
| 77 |
++ CFLAGS="${PY_CFLAGS}"\ ${CMAKE_C_FLAGS} |
| 78 |
+ CPPFLAGS="${PY_CPPFLAGS}" |
| 79 |
+ CXX="${PY_CXX}" |
| 80 |
+ LDSHARED="${PY_LDSHARED}" |
| 81 |
+ OPT=\"-DNDEBUG -g -fwrapv -w\" |
| 82 |
+- LDFLAGS=-L${CMAKE_LIBRARY_OUTPUT_DIRECTORY} |
| 83 |
++ LDFLAGS=-L${CMAKE_LIBRARY_OUTPUT_DIRECTORY}\ ${CMAKE_LINKER_FLAGS}\ ${CMAKE_SHARED_LINKER_FLAGS} |
| 84 |
+ CYTHON_BUILD_DIR=${CMAKE_CURRENT_BINARY_DIR} |
| 85 |
+ CEPH_LIBDIR=${CMAKE_LIBRARY_OUTPUT_DIRECTORY} |
| 86 |
+ ${Python3_EXECUTABLE} ${setup_py} |
Archives