svn commit: r515610 - in head/net/ceph14: . files

[Steve Wills]

Author: swills
Date: Fri Oct 25 13:33:40 2019
New Revision: 515610
URL: https://svnweb.freebsd.org/changeset/ports/515610

Log:
  net/ceph14: Fix build on 11.2
  
  PR:		239415
  Submitted by:	Willem Jan Withagen <wjw at digiware.nl> (maintainer)

Added:
  head/net/ceph14/files/patch-src_rgw_rgw__iam__policy.h   (contents, props changed)
Modified:
  head/net/ceph14/Makefile   (contents, props changed)

Modified: head/net/ceph14/Makefile
==============================================================================
--- head/net/ceph14/Makefile	Fri Oct 25 13:33:09 2019	(r515609)
+++ head/net/ceph14/Makefile	Fri Oct 25 13:33:40 2019	(r515610)
@@ -94,8 +94,8 @@ GROUPS=		ceph
 
 .include <bsd.port.options.mk>
 
-# 12.0 RELEASE has clang60 and will give versioning errors
-.if ${OSVERSION} >= 1200000 && ${OSVERSION} < 1200099
+# 11.2 and 12.0 RELEASE has clang60 and will give versioning errors
+.if (${OSVERSION} < 1102507) || (${OSVERSION} >= 1200000 && ${OSVERSION} < 1200099)
 BUILD_DEPENDS+=	${LOCALBASE}/bin/clang80:devel/llvm80
 CC=		clang80
 CXX=		clang++80

Added: head/net/ceph14/files/patch-src_rgw_rgw__iam__policy.h
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/net/ceph14/files/patch-src_rgw_rgw__iam__policy.h	Fri Oct 25 13:33:40 2019	(r515610)
@@ -0,0 +1,21 @@
+diff --git a/src/rgw/rgw_iam_policy.h b/src/rgw/rgw_iam_policy.h
+index f6269dbef6ac..00048b4a7af0 100644
+--- src/rgw/rgw_iam_policy.h
++++ src/rgw/rgw_iam_policy.h
+@@ -9,7 +9,6 @@
+ #include <cstdint>
+ #include <iostream>
+ #include <string>
+-#include <bitset>
+ 
+ #include <boost/algorithm/string/predicate.hpp>
+ #include <boost/container/flat_map.hpp>
+@@ -125,7 +124,7 @@ static constexpr std::uint64_t stsAll = 79;
+ static constexpr std::uint64_t s3Count = s3BypassGovernanceRetention + 1;
+ static constexpr std::uint64_t allCount = stsAll + 1;
+ 
+-using Action_t = bitset<allCount>;
++using Action_t = std::bitset<allCount>;
+ using NotAction_t = Action_t;
+ 
+ static const Action_t None(0);