1 |
commit: dc412bfceb29b3de1cab492e25dd17ead7eabf13 |
2 |
Author: Patrick McLean <chutzpah <AT> gentoo <DOT> org> |
3 |
AuthorDate: Wed Aug 24 23:27:37 2022 +0000 |
4 |
Commit: Patrick McLean <chutzpah <AT> gentoo <DOT> org> |
5 |
CommitDate: Wed Aug 24 23:27:37 2022 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=dc412bfc |
7 |
|
8 |
sys-cluster/ceph: Make sure LDFLAGS is respected for python |
9 |
|
10 |
Signed-off-by: Patrick McLean <chutzpah <AT> gentoo.org> |
11 |
|
12 |
sys-cluster/ceph/ceph-16.2.10-r2.ebuild | 1 + |
13 |
sys-cluster/ceph/files/ceph-16.2.10-flags.patch | 14 ++++++++++++++ |
14 |
2 files changed, 15 insertions(+) |
15 |
|
16 |
diff --git a/sys-cluster/ceph/ceph-16.2.10-r2.ebuild b/sys-cluster/ceph/ceph-16.2.10-r2.ebuild |
17 |
index 93265481033e..546f6123d069 100644 |
18 |
--- a/sys-cluster/ceph/ceph-16.2.10-r2.ebuild |
19 |
+++ b/sys-cluster/ceph/ceph-16.2.10-r2.ebuild |
20 |
@@ -219,6 +219,7 @@ PATCHES=( |
21 |
"${FILESDIR}/ceph-17.2.0-fuse3.patch" |
22 |
"${FILESDIR}/ceph-16.2.9-python310.patch" |
23 |
"${FILESDIR}/ceph-17.2.0-gcc12-header.patch" |
24 |
+ "${FILESDIR}/ceph-16.2.10-flags.patch" |
25 |
) |
26 |
|
27 |
check-reqs_export_vars() { |
28 |
|
29 |
diff --git a/sys-cluster/ceph/files/ceph-16.2.10-flags.patch b/sys-cluster/ceph/files/ceph-16.2.10-flags.patch |
30 |
new file mode 100644 |
31 |
index 000000000000..79002b3a5fce |
32 |
--- /dev/null |
33 |
+++ b/sys-cluster/ceph/files/ceph-16.2.10-flags.patch |
34 |
@@ -0,0 +1,14 @@ |
35 |
+diff --git a/cmake/modules/Distutils.cmake b/cmake/modules/Distutils.cmake |
36 |
+index 01a6fc500c8..9eb4658482f 100644 |
37 |
+--- a/cmake/modules/Distutils.cmake |
38 |
++++ b/cmake/modules/Distutils.cmake |
39 |
+@@ -90,7 +90,8 @@ function(distutils_add_cython_module target name src) |
40 |
+ CXX="${PY_CXX}" |
41 |
+ LDSHARED="${PY_LDSHARED}" |
42 |
+ OPT=\"-DNDEBUG -g -fwrapv -w\" |
43 |
+- LDFLAGS=-L${CMAKE_LIBRARY_OUTPUT_DIRECTORY} |
44 |
++ CFLAGS=${CMAKE_C_FLAGS} |
45 |
++ LDFLAGS=-L${CMAKE_LIBRARY_OUTPUT_DIRECTORY}\ ${CMAKE_LINKER_FLAGS}\ ${CMAKE_SHARED_LINKER_FLAGS} |
46 |
+ CYTHON_BUILD_DIR=${CMAKE_CURRENT_BINARY_DIR} |
47 |
+ CEPH_LIBDIR=${CMAKE_LIBRARY_OUTPUT_DIRECTORY} |
48 |
+ ${Python3_EXECUTABLE} ${setup_py} |