Date: Tue, 11 May 2021 12:42:30 GMT From: Dima Panov <fluffy@FreeBSD.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org Subject: git: 50ea41c1535f - main - net/ceph14: unbreak build after recent API changes in archivers/snappy Message-ID: <202105111242.14BCgUZo061787@gitrepo.freebsd.org>
next in thread | raw e-mail | index | archive | help
The branch main has been updated by fluffy: URL: https://cgit.FreeBSD.org/ports/commit/?id=50ea41c1535f68834fe08a1a2625eb0f930f3bca commit 50ea41c1535f68834fe08a1a2625eb0f930f3bca Author: Dima Panov <fluffy@FreeBSD.org> AuthorDate: 2021-05-11 12:41:06 +0000 Commit: Dima Panov <fluffy@FreeBSD.org> CommitDate: 2021-05-11 12:41:06 +0000 net/ceph14: unbreak build after recent API changes in archivers/snappy Snappy now drops own rewrite for cstdint types such as uint32_t Bump PORTREVISION to force rebuid with new snappy API changes Pointyhat to: vanilla (for skip consumers' testbuilds) --- net/ceph14/Makefile | 2 +- .../patch-src_compressor_snappy_SnappyCompressor.h | 19 +++++++++++++++++++ 2 files changed, 20 insertions(+), 1 deletion(-) diff --git a/net/ceph14/Makefile b/net/ceph14/Makefile index 0b3fba537051..22c90093c3de 100644 --- a/net/ceph14/Makefile +++ b/net/ceph14/Makefile @@ -3,7 +3,7 @@ PORTNAME= ceph DISTVERSIONPREFIX= v DISTVERSION= 14.2.11 -PORTREVISION= 3 +PORTREVISION= 4 CATEGORIES= net PKGNAMESUFFIX= 14 diff --git a/net/ceph14/files/patch-src_compressor_snappy_SnappyCompressor.h b/net/ceph14/files/patch-src_compressor_snappy_SnappyCompressor.h new file mode 100644 index 000000000000..313c4edb8265 --- /dev/null +++ b/net/ceph14/files/patch-src_compressor_snappy_SnappyCompressor.h @@ -0,0 +1,19 @@ +--- src/compressor/snappy/SnappyCompressor.h.orig 2020-08-10 20:15:22 UTC ++++ src/compressor/snappy/SnappyCompressor.h +@@ -15,6 +15,7 @@ + #ifndef CEPH_SNAPPYCOMPRESSOR_H + #define CEPH_SNAPPYCOMPRESSOR_H + ++#include <cstdint> + #include <snappy.h> + #include <snappy-sinksource.h> + #include "common/config.h" +@@ -96,7 +97,7 @@ class SnappyCompressor : public Compressor { + if (qat_enabled) + return qat_accel.decompress(p, compressed_len, dst); + #endif +- snappy::uint32 res_len = 0; ++ std::uint32_t res_len = 0; + BufferlistSource source_1(p, compressed_len); + if (!snappy::GetUncompressedLength(&source_1, &res_len)) { + return -1;
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202105111242.14BCgUZo061787>