summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPatrick McLean <chutzpah@gentoo.org>2022-08-24 16:27:37 -0700
committerPatrick McLean <chutzpah@gentoo.org>2022-08-24 16:27:37 -0700
commitdc412bfceb29b3de1cab492e25dd17ead7eabf13 (patch)
treed34097fc3d402952bb0897c7945d03723ddd7769
parentapp-emulation/virt-manager: add virt-install optfeature in pkg_postinst (diff)
downloadgentoo-dc412bfc.tar.gz
gentoo-dc412bfc.tar.bz2
gentoo-dc412bfc.zip
sys-cluster/ceph: Make sure LDFLAGS is respected for python
Signed-off-by: Patrick McLean <chutzpah@gentoo.org>
-rw-r--r--sys-cluster/ceph/ceph-16.2.10-r2.ebuild1
-rw-r--r--sys-cluster/ceph/files/ceph-16.2.10-flags.patch14
2 files changed, 15 insertions, 0 deletions
diff --git a/sys-cluster/ceph/ceph-16.2.10-r2.ebuild b/sys-cluster/ceph/ceph-16.2.10-r2.ebuild
index 93265481033e..546f6123d069 100644
--- a/sys-cluster/ceph/ceph-16.2.10-r2.ebuild
+++ b/sys-cluster/ceph/ceph-16.2.10-r2.ebuild
@@ -219,6 +219,7 @@ PATCHES=(
"${FILESDIR}/ceph-17.2.0-fuse3.patch"
"${FILESDIR}/ceph-16.2.9-python310.patch"
"${FILESDIR}/ceph-17.2.0-gcc12-header.patch"
+ "${FILESDIR}/ceph-16.2.10-flags.patch"
)
check-reqs_export_vars() {
diff --git a/sys-cluster/ceph/files/ceph-16.2.10-flags.patch b/sys-cluster/ceph/files/ceph-16.2.10-flags.patch
new file mode 100644
index 000000000000..79002b3a5fce
--- /dev/null
+++ b/sys-cluster/ceph/files/ceph-16.2.10-flags.patch
@@ -0,0 +1,14 @@
+diff --git a/cmake/modules/Distutils.cmake b/cmake/modules/Distutils.cmake
+index 01a6fc500c8..9eb4658482f 100644
+--- a/cmake/modules/Distutils.cmake
++++ b/cmake/modules/Distutils.cmake
+@@ -90,7 +90,8 @@ function(distutils_add_cython_module target name src)
+ CXX="${PY_CXX}"
+ LDSHARED="${PY_LDSHARED}"
+ OPT=\"-DNDEBUG -g -fwrapv -w\"
+- LDFLAGS=-L${CMAKE_LIBRARY_OUTPUT_DIRECTORY}
++ CFLAGS=${CMAKE_C_FLAGS}
++ LDFLAGS=-L${CMAKE_LIBRARY_OUTPUT_DIRECTORY}\ ${CMAKE_LINKER_FLAGS}\ ${CMAKE_SHARED_LINKER_FLAGS}
+ CYTHON_BUILD_DIR=${CMAKE_CURRENT_BINARY_DIR}
+ CEPH_LIBDIR=${CMAKE_LIBRARY_OUTPUT_DIRECTORY}
+ ${Python3_EXECUTABLE} ${setup_py}