From owner-svn-ports-head@freebsd.org Fri Oct 25 13:33:41 2019 Return-Path: Delivered-To: svn-ports-head@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id B1DE71710C9; Fri, 25 Oct 2019 13:33:41 +0000 (UTC) (envelope-from swills@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) server-signature RSA-PSS (4096 bits) client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4704nd48SHz4W5w; Fri, 25 Oct 2019 13:33:41 +0000 (UTC) (envelope-from swills@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 71FF8271C3; Fri, 25 Oct 2019 13:33:41 +0000 (UTC) (envelope-from swills@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id x9PDXfcs057365; Fri, 25 Oct 2019 13:33:41 GMT (envelope-from swills@FreeBSD.org) Received: (from swills@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id x9PDXfq0057363; Fri, 25 Oct 2019 13:33:41 GMT (envelope-from swills@FreeBSD.org) Message-Id: <201910251333.x9PDXfq0057363@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: swills set sender to swills@FreeBSD.org using -f From: Steve Wills Date: Fri, 25 Oct 2019 13:33:41 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r515610 - in head/net/ceph14: . files X-SVN-Group: ports-head X-SVN-Commit-Author: swills X-SVN-Commit-Paths: in head/net/ceph14: . files X-SVN-Commit-Revision: 515610 X-SVN-Commit-Repository: ports MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 25 Oct 2019 13:33:41 -0000 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 (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 -# 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 + #include + #include +-#include + + #include + #include +@@ -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; ++using Action_t = std::bitset; + using NotAction_t = Action_t; + + static const Action_t None(0);