commit: 99d68c0890aa6e633663406368e003a60f13e6f2 Author: Sam James <sam <AT> gentoo <DOT> org> AuthorDate: Tue Feb 25 06:34:01 2025 +0000 Commit: Sam James <sam <AT> gentoo <DOT> org> CommitDate: Tue Feb 25 06:34:01 2025 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=99d68c08
sys-cluster/ceph: don't break installed bundled libraries The cmake.eclass `-DBUILD_SHARED_LIBS=ON` default breaks bundled libraries when they're forced to be shared. Flip it to off given ceph clearly isn't supposed to be built with it. Fixes loading libcpp_redis.so at least but possibly others. Closes: https://bugs.gentoo.org/942680 Signed-off-by: Sam James <sam <AT> gentoo.org> sys-cluster/ceph/{ceph-18.2.4-r3.ebuild => ceph-18.2.4-r4.ebuild} | 4 +++- sys-cluster/ceph/{ceph-19.2.0-r2.ebuild => ceph-19.2.0-r3.ebuild} | 2 ++ sys-cluster/ceph/{ceph-19.2.1.ebuild => ceph-19.2.1-r1.ebuild} | 2 ++ 3 files changed, 7 insertions(+), 1 deletion(-) diff --git a/sys-cluster/ceph/ceph-18.2.4-r3.ebuild b/sys-cluster/ceph/ceph-18.2.4-r4.ebuild similarity index 99% rename from sys-cluster/ceph/ceph-18.2.4-r3.ebuild rename to sys-cluster/ceph/ceph-18.2.4-r4.ebuild index 345c800a98ba..407b3b7643a3 100644 --- a/sys-cluster/ceph/ceph-18.2.4-r3.ebuild +++ b/sys-cluster/ceph/ceph-18.2.4-r4.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2024 Gentoo Authors +# Copyright 1999-2025 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 @@ -308,6 +308,8 @@ src_prepare() { ceph_src_configure() { local mycmakeargs=( + # Don't break installed bundled libraries (bug #942680) + -DBUILD_SHARED_LIBS=OFF -DWITH_BABELTRACE:BOOL=$(usex babeltrace) -DWITH_BLUESTORE_PMEM:BOOL=$(usex pmdk) -DWITH_CEPHFS:BOOL=$(usex cephfs) diff --git a/sys-cluster/ceph/ceph-19.2.0-r2.ebuild b/sys-cluster/ceph/ceph-19.2.0-r3.ebuild similarity index 99% rename from sys-cluster/ceph/ceph-19.2.0-r2.ebuild rename to sys-cluster/ceph/ceph-19.2.0-r3.ebuild index aaa14b976b0d..121fdfc85a33 100644 --- a/sys-cluster/ceph/ceph-19.2.0-r2.ebuild +++ b/sys-cluster/ceph/ceph-19.2.0-r3.ebuild @@ -316,6 +316,8 @@ src_prepare() { ceph_src_configure() { local mycmakeargs=( + # Don't break installed bundled libraries (bug #942680) + -DBUILD_SHARED_LIBS=OFF -DWITH_BABELTRACE:BOOL=$(usex babeltrace) -DWITH_BLUESTORE_PMEM:BOOL=$(usex pmdk) -DWITH_CEPHFS:BOOL=$(usex cephfs) diff --git a/sys-cluster/ceph/ceph-19.2.1.ebuild b/sys-cluster/ceph/ceph-19.2.1-r1.ebuild similarity index 99% rename from sys-cluster/ceph/ceph-19.2.1.ebuild rename to sys-cluster/ceph/ceph-19.2.1-r1.ebuild index 741766d8351d..415d128974f9 100644 --- a/sys-cluster/ceph/ceph-19.2.1.ebuild +++ b/sys-cluster/ceph/ceph-19.2.1-r1.ebuild @@ -322,6 +322,8 @@ src_prepare() { ceph_src_configure() { local mycmakeargs=( + # Don't break installed bundled libraries (bug #942680) + -DBUILD_SHARED_LIBS=OFF -DWITH_BABELTRACE:BOOL=$(usex babeltrace) -DWITH_BLUESTORE_PMEM:BOOL=$(usex pmdk) -DWITH_CEPHFS:BOOL=$(usex cephfs)
