From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from smtp.gentoo.org (woodpecker.gentoo.org [140.211.166.183]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 15C991582EF for ; Tue, 25 Feb 2025 06:36:13 +0000 (UTC) Received: from lists.gentoo.org (bobolink.gentoo.org [140.211.166.189]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) (Authenticated sender: relay-lists.gentoo.org@gentoo.org) by smtp.gentoo.org (Postfix) with ESMTPSA id EBEED3431A3 for ; Tue, 25 Feb 2025 06:36:12 +0000 (UTC) Received: from bobolink.gentoo.org (localhost [127.0.0.1]) by bobolink.gentoo.org (Postfix) with ESMTP id 4FF91110260; Tue, 25 Feb 2025 06:36:11 +0000 (UTC) Received: from smtp.gentoo.org (woodpecker.gentoo.org [140.211.166.183]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by bobolink.gentoo.org (Postfix) with ESMTPS id 440CF110260 for ; Tue, 25 Feb 2025 06:36:11 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id E2FA834318D for ; Tue, 25 Feb 2025 06:36:10 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 1A63827B6 for ; Tue, 25 Feb 2025 06:36:09 +0000 (UTC) From: "Sam James" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Sam James" Message-ID: <1740465241.99d68c0890aa6e633663406368e003a60f13e6f2.sam@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: sys-cluster/ceph/ X-VCS-Repository: repo/gentoo X-VCS-Files: sys-cluster/ceph/ceph-18.2.4-r3.ebuild sys-cluster/ceph/ceph-18.2.4-r4.ebuild sys-cluster/ceph/ceph-19.2.0-r2.ebuild sys-cluster/ceph/ceph-19.2.0-r3.ebuild sys-cluster/ceph/ceph-19.2.1-r1.ebuild sys-cluster/ceph/ceph-19.2.1.ebuild X-VCS-Directories: sys-cluster/ceph/ X-VCS-Committer: sam X-VCS-Committer-Name: Sam James X-VCS-Revision: 99d68c0890aa6e633663406368e003a60f13e6f2 X-VCS-Branch: master Date: Tue, 25 Feb 2025 06:36:09 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: 46fbff2c-1813-4fcd-b994-ead4a42c77c8 X-Archives-Hash: b81490a265defded25889fc5bd606a4d commit: 99d68c0890aa6e633663406368e003a60f13e6f2 Author: Sam James gentoo org> AuthorDate: Tue Feb 25 06:34:01 2025 +0000 Commit: Sam James gentoo 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 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)