From 1525443e02f5462934d32904973692541b7057d7 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Fri, 5 Nov 2021 22:49:43 +0100 Subject: gnu: ceph: Update to 16.2.6. * gnu/packages/storage.scm (ceph): Update to 16.2.6. [source](patches): Add two new patches. Remove one obsolete. [source](snippet): Unbundle fmt. [arguments]: Remove -DWITH_PYTHON3 from #:configure-flags. Add -DWITH_SYSTEMD. Adjust RUNPATH substitution, and the wrap-python-scripts phase, for upstream changes. Remove trailing #t's. [inputs]: Remove PYTHON-SIX and PYTHON-WRAPPER. Add FMT, ICU4C, PYTHON-PYYAML, PYTHON, and SQLITE. * gnu/packages/patches/ceph-fix-snappy-breaking-change.patch: Delete file. * gnu/packages/patches/ceph-boost-compat.patch, gnu/packages/patches/ceph-rocksdb-compat.patch: New files. * gnu/local.mk (dist_patch_DATA): Adjust accordingly. --- gnu/packages/patches/ceph-boost-compat.patch | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) create mode 100644 gnu/packages/patches/ceph-boost-compat.patch (limited to 'gnu/packages/patches/ceph-boost-compat.patch') diff --git a/gnu/packages/patches/ceph-boost-compat.patch b/gnu/packages/patches/ceph-boost-compat.patch new file mode 100644 index 0000000000..1aecfbbed5 --- /dev/null +++ b/gnu/packages/patches/ceph-boost-compat.patch @@ -0,0 +1,18 @@ +Add extra includes required for Boost 1.75 and later. + +Taken from upstram: + + https://github.com/ceph/ceph/commit/ebf3a0398f18eab67d2ba25e6a10b41ff140f6a4 + +diff --git a/src/rgw/rgw_string.h b/src/rgw/rgw_string.h +index 257daa9c1fe6e..90e64f98a2587 100644 +--- a/src/rgw/rgw_string.h ++++ b/src/rgw/rgw_string.h +@@ -8,5 +8,7 @@ + #include + #include + #include ++#include ++#include + + #include -- cgit v1.2.3