commit: 437de761a9fcea3ace8cecc6e0573359507fe652 Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> AuthorDate: Wed Feb 18 23:31:31 2026 +0000 Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> CommitDate: Thu Feb 19 00:24:00 2026 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=437de761
sys-cluster/ceph: Remove unused bundled libs where possible Disable finding git Use patch instead of sed in another boost fixing occurrence. Bug: https://bugs.gentoo.org/960808 Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org> sys-cluster/ceph/ceph-20.1.1-r1.ebuild | 26 ++++--- .../ceph/files/ceph-20.1.1-boost-url-linking.patch | 80 ++++++++++++++++++++++ 2 files changed, 92 insertions(+), 14 deletions(-) diff --git a/sys-cluster/ceph/ceph-20.1.1-r1.ebuild b/sys-cluster/ceph/ceph-20.1.1-r1.ebuild index ed1de5c8541d..d48b8779f5f0 100644 --- a/sys-cluster/ceph/ceph-20.1.1-r1.ebuild +++ b/sys-cluster/ceph/ceph-20.1.1-r1.ebuild @@ -47,10 +47,8 @@ REQUIRED_USE=" nvmeof? ( spdk ) " -RESTRICT="!test? ( test )" - # tests need root access, and network access -RESTRICT+=" test" +RESTRICT="test !test? ( test )" DEPEND=" ${LUA_DEPS} @@ -229,6 +227,7 @@ PATCHES=( "${FILESDIR}/ceph-19.2.2-silent-unused-variable-warning.patch" "${FILESDIR}/ceph-19.2.2-src-mgr-make-enum-statically-castable.patch" "${FILESDIR}/ceph-20.1.0-nvmeof.patch" + "${FILESDIR}/ceph-20.1.1-boost-url-linking.patch" # https://bugs.gentoo.org/969039 "${FILESDIR}"/ceph-20.1.1-boost-1.89-{1,2,3}.patch ) @@ -262,6 +261,15 @@ src_prepare() { rm -r src/boost || die # ensure use system boost, reduce QA spam fi + # ensure system-libs, reduce QA spam (FIXME: fails w/o zstd subdir) + rm -r src/{c-ares,jaegertracing/opentelemetry-cpp,rocksdb,s3select/rapidjson,utf8proc} || die + + if use parquet; then + # hammer in newer version of parquet/arrow + rm -r src/arrow/ || die + mv "${WORKDIR}/apache-arrow-17.0.0" src/arrow || die + fi + cmake_src_prepare if ! use systemd; then @@ -291,23 +299,13 @@ src_prepare() { # remove tests that need root access rm src/test/cli/ceph-authtool/cap*.t || die - - if use parquet; then - # hammer in newer version of parquet/arrow - rm -r src/arrow/ || die - mv "${WORKDIR}/apache-arrow-17.0.0" src/arrow || die - fi - - # everyone forgot to link to boost_url - sed -i -e 's~target_link_libraries(ceph-mds mds ${CMAKE_DL_LIBS} global-static ceph-common~target_link_libraries(ceph-mds mds ${CMAKE_DL_LIBS} global-static ceph-common boost_url~' src/CMakeLists.txt || die - sed -i -e 's/target_link_libraries(journal cls_journal_client)/target_link_libraries(journal cls_journal_client boost_url)/' src/journal/CMakeLists.txt || die - sed -i -e 's/${BLKID_LIBRARIES} ${CMAKE_DL_LIBS})/${BLKID_LIBRARIES} ${CMAKE_DL_LIBS} boost_url)/g' src/tools/cephfs/CMakeLists.txt || die } ceph_src_configure() { local mycmakeargs=( # Don't break installed bundled libraries (bug #942680) -DBUILD_SHARED_LIBS=OFF + -DCMAKE_DISABLE_FIND_PACKAGE_Git=ON -DWITH_BABELTRACE:BOOL=$(usex babeltrace) -DWITH_BLUESTORE_PMEM:BOOL=$(usex pmdk) -DWITH_CEPHFS:BOOL=$(usex cephfs) diff --git a/sys-cluster/ceph/files/ceph-20.1.1-boost-url-linking.patch b/sys-cluster/ceph/files/ceph-20.1.1-boost-url-linking.patch new file mode 100644 index 000000000000..142eb8ded197 --- /dev/null +++ b/sys-cluster/ceph/files/ceph-20.1.1-boost-url-linking.patch @@ -0,0 +1,80 @@ +From b7f2f97043b2f1104eb6a2e81400dc7806ba68b6 Mon Sep 17 00:00:00 2001 +From: Andreas Sturmlechner <[email protected]> +Date: Thu, 19 Feb 2026 00:27:08 +0100 +Subject: [PATCH] Link to Boost::url + +Just replacing use of sed here. ("# everyone forgot to link to Boost::url") + +Signed-off-by: Andreas Sturmlechner <[email protected]> +--- + src/CMakeLists.txt | 2 +- + src/journal/CMakeLists.txt | 2 +- + src/tools/cephfs/CMakeLists.txt | 8 ++++---- + 3 files changed, 6 insertions(+), 6 deletions(-) + +diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt +index fe0b5ef7..c58666ee 100644 +--- a/src/CMakeLists.txt ++++ b/src/CMakeLists.txt +@@ -750,7 +750,7 @@ if (WITH_CEPHFS) + ceph_mds.cc) + add_executable(ceph-mds ${ceph_mds_srcs}) + target_link_libraries(ceph-mds mds ${CMAKE_DL_LIBS} global-static ceph-common +- Boost::thread ++ Boost::thread Boost::url + ${ALLOC_LIBS}) + install(TARGETS ceph-mds DESTINATION bin) + endif() +diff --git a/src/journal/CMakeLists.txt b/src/journal/CMakeLists.txt +index 3632c105..0dc8520d 100644 +--- a/src/journal/CMakeLists.txt ++++ b/src/journal/CMakeLists.txt +@@ -11,4 +11,4 @@ set(journal_srcs + ObjectRecorder.cc + Utils.cc) + add_library(journal STATIC ${journal_srcs}) +-target_link_libraries(journal cls_journal_client) ++target_link_libraries(journal cls_journal_client Boost::url) +diff --git a/src/tools/cephfs/CMakeLists.txt b/src/tools/cephfs/CMakeLists.txt +index 6bac749a..5395e3a9 100644 +--- a/src/tools/cephfs/CMakeLists.txt ++++ b/src/tools/cephfs/CMakeLists.txt +@@ -12,7 +12,7 @@ add_executable(cephfs-journal-tool ${cephfs_journal_tool_srcs}) + target_link_libraries(cephfs-journal-tool + legacy-option-headers + librados mds osdc global +- ${BLKID_LIBRARIES} ${CMAKE_DL_LIBS}) ++ ${BLKID_LIBRARIES} ${CMAKE_DL_LIBS} Boost::url) + + set(cephfs-meta-injection_srcs + cephfs-meta-injection.cc +@@ -23,7 +23,7 @@ add_executable(cephfs-meta-injection ${cephfs-meta-injection_srcs}) + target_link_libraries(cephfs-meta-injection + legacy-option-headers + librados mds osdc global +- ${BLKID_LIBRARIES} ${CMAKE_DL_LIBS}) ++ ${BLKID_LIBRARIES} ${CMAKE_DL_LIBS} Boost::url) + + set(cephfs_table_tool_srcs + cephfs-table-tool.cc +@@ -32,7 +32,7 @@ set(cephfs_table_tool_srcs + MDSUtility.cc) + add_executable(cephfs-table-tool ${cephfs_table_tool_srcs}) + target_link_libraries(cephfs-table-tool librados mds osdc global +- ${BLKID_LIBRARIES} ${CMAKE_DL_LIBS}) ++ ${BLKID_LIBRARIES} ${CMAKE_DL_LIBS} Boost::url) + + set(cephfs_data_scan_srcs + cephfs-data-scan.cc +@@ -43,7 +43,7 @@ set(cephfs_data_scan_srcs + add_executable(cephfs-data-scan ${cephfs_data_scan_srcs}) + target_link_libraries(cephfs-data-scan librados cephfs mds osdc global + cls_cephfs_client +- ${BLKID_LIBRARIES} ${CMAKE_DL_LIBS}) ++ ${BLKID_LIBRARIES} ${CMAKE_DL_LIBS} Boost::url) + + install(TARGETS + cephfs-journal-tool +-- +2.53.0 +
