commit: 23de7198b00313bf696af3ba9920ae3803304615
Author: Patrick Lauer <patrick <AT> gentoo <DOT> org>
AuthorDate: Mon Jun 9 17:16:18 2025 +0000
Commit: Patrick Lauer <patrick <AT> gentoo <DOT> org>
CommitDate: Mon Jun 9 17:16:49 2025 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=23de7198
sys-cluster/ceph: Better fix for libutf8proc
Signed-off-by: Patrick Lauer <patrick <AT> gentoo.org>
sys-cluster/ceph/Manifest | 1 -
sys-cluster/ceph/{ceph-19.2.2-r5.ebuild => ceph-19.2.2-r6.ebuild} | 5 +----
2 files changed, 1 insertion(+), 5 deletions(-)
diff --git a/sys-cluster/ceph/Manifest b/sys-cluster/ceph/Manifest
index 3c29c6b5acc6..df1fbce76a6f 100644
--- a/sys-cluster/ceph/Manifest
+++ b/sys-cluster/ceph/Manifest
@@ -3,4 +3,3 @@ DIST ceph-18.2.4.tar.gz 226953064 BLAKE2B
3865ea051d1bd2f9aa44e6379f5bf2c7a526b0
DIST ceph-19.2.2.tar.gz 237487045 BLAKE2B
f6257f3cded9c705e230fa6f0b46de3e22ffd0b826960c721a1a56ee2822f48c37a67ae03c01af22d25785f8d9c132034174630e9167d44b7fde6bfa7ad1a4dc
SHA512
ee47c1cb7cb5084b87bcc5a35b3df88fb49683524bba8f2e1ced9d2f8891af53e4b5fb5aa153ed6bce31683625d9bf5176bab9f55bc71671f0e34667948f7285
DIST ceph-xsimd-18.2.4.tar.gz 173025 BLAKE2B
54679c24804c195ae55b9f49589e331dde92c6d89aaa20e827539e9a4e0010c7549cdd5cf02a7ebed83f953ab2a6f1d9cc9a98cf45c3dc7758ae4938c9c43713
SHA512
ecc58e7909648aaa22aefbf76ee2c5a2bece4b1b88da9c7eda1b69a46247e619ff99c4366afd6015f95debd68c1a6b89292c677b9049462d0fc0255fbc0c2a33
DIST ceph-xsimd-19.2.2.tar.gz 173025 BLAKE2B
54679c24804c195ae55b9f49589e331dde92c6d89aaa20e827539e9a4e0010c7549cdd5cf02a7ebed83f953ab2a6f1d9cc9a98cf45c3dc7758ae4938c9c43713
SHA512
ecc58e7909648aaa22aefbf76ee2c5a2bece4b1b88da9c7eda1b69a46247e619ff99c4366afd6015f95debd68c1a6b89292c677b9049462d0fc0255fbc0c2a33
-DIST utf8proc-2.10.0.tar.gz 199045 BLAKE2B
5fdbf4d2606033c752ca965593431714cbc968a3c41905410e32cb2bd707a651428ee9fda0abfc365bf2129816fce392c3fe537426d64412ca543fe97dc14af5
SHA512
92a771606bcbecbb86c8d101931bc042dc7035938a665a7a449c2d8a7d3255df9df9c77c5cab0fc9dcaecb04be970149f60bfff463fc813e96727b7035ca9bb4
diff --git a/sys-cluster/ceph/ceph-19.2.2-r5.ebuild
b/sys-cluster/ceph/ceph-19.2.2-r6.ebuild
similarity index 98%
rename from sys-cluster/ceph/ceph-19.2.2-r5.ebuild
rename to sys-cluster/ceph/ceph-19.2.2-r6.ebuild
index 49f14b06c30a..f9b3eee8e169 100644
--- a/sys-cluster/ceph/ceph-19.2.2-r5.ebuild
+++ b/sys-cluster/ceph/ceph-19.2.2-r6.ebuild
@@ -16,7 +16,6 @@ HOMEPAGE="https://ceph.com/";
SRC_URI="
https://download.ceph.com/tarballs/${P}.tar.gz
-
https://github.com/JuliaStrings/utf8proc/archive/v2.10.0/utf8proc-2.10.0.tar.gz
parquet? (
https://github.com/xtensor-stack/xsimd/archive/${XSIMD_HASH}.tar.gz ->
ceph-xsimd-${PV}.tar.gz
mirror://apache/arrow/arrow-17.0.0/apache-arrow-17.0.0.tar.gz )
"
@@ -330,9 +329,6 @@ src_prepare() {
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
-
- rm -rf src/utf8proc
- mv "${WORKDIR}/utf8proc-2.10.0" src/utf8proc || die
}
ceph_src_configure() {
@@ -373,6 +369,7 @@ ceph_src_configure() {
-DWITH_SYSTEM_ROCKSDB:BOOL=ON
-DWITH_SYSTEM_ZSTD:BOOL=ON
-DWITH_RDMA:BOOL=$(usex rdma)
+ -DWITH_SYSTEM_UTF8PROC:BOOL=ON
-DCMAKE_INSTALL_DOCDIR:PATH="${EPREFIX}/usr/share/doc/${PN}-${PVR}"
-DCMAKE_INSTALL_SYSCONFDIR:PATH="${EPREFIX}/etc"
# use the bundled libfmt for now since they seem to constantly
break their API
