From nobody Sat May 14 17:45:18 2022 X-Original-To: dev-commits-ports-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id CE1441AEAA49; Sat, 14 May 2022 17:45:18 +0000 (UTC) (envelope-from git@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) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4L0tFp5Myjz3j9T; Sat, 14 May 2022 17:45:18 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1652550318; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=z+R6xqyPQBQojQYiScJJfiyvy5zB/1Tts/k80MOHfqA=; b=EasGMYObxPOvx+PePrt/rVVw8+NMKZKIULZj7/BRvINFhCZ9QjNYDEKcZsIlmVChu8QLKN zlbbMFsvLZIi4FiJ7oAOhtlGdOY7NTvIm9Sg6HOM3Jeq3KebARNi/sFKPWZptLIIOaMXJv bJS295NCwhM7TJmB+VPgn0MFwULbLU0JWOiUQ5JV8fkENwwkqq4WHrblEImAo689u9c3kB ASCNSvy4GnsfAtaKr1PhUE1NqwZhOsb7odHHEtzKnzGWfV5dRLECAFQxplTZdBWe8v8cVW J4DFeTWnOGFyQwy4PaqjhrvT9QDsqp99tiJeTY+t6ILBskcgH7hD8Ny/6eD6Og== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 9834C1BE0C; Sat, 14 May 2022 17:45:18 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 24EHjI7S002924; Sat, 14 May 2022 17:45:18 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 24EHjIV0002923; Sat, 14 May 2022 17:45:18 GMT (envelope-from git) Date: Sat, 14 May 2022 17:45:18 GMT Message-Id: <202205141745.24EHjIV0002923@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Po-Chuan Hsieh Subject: git: 21b89b758b1c - main - www/libecap: Fix build with Clang 13+ List-Id: Commit messages for all branches of the ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-all@freebsd.org X-BeenThere: dev-commits-ports-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: sunpoet X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 21b89b758b1c5c57b4ccbb02301da48ba5099753 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1652550318; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=z+R6xqyPQBQojQYiScJJfiyvy5zB/1Tts/k80MOHfqA=; b=s78+hOGHfvZlzA6hRsnO3J1mqFB6v8FX+MTCa88gEut2jQreLimsnduS/B6X0KB0eOM31N FQy7T7X+9kI+PfohFz/xXgE+q04Ko1FDPFEF9bFIOqCMkTV8EZ99qZktiVIrEISBa0FF1J PpOeYu4NQfK6fRdUteZMn6OIsIRj0P3141R39StOcX/Qnj0BrFvEI+mqxjzeMyqLAXzBO/ zjOVUqIifo+jNAR1mhznXEZTn5c2+w5oIoUNqUce7Jj4xhSePYTV8Tb9QelGoNNbsgNAXr rYWZWdGGIE9dVWKt/Sk/vl6oJ/vzyVm4goan7JY9g1Iz4ljcRQ2q/VATZ+71UA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1652550318; a=rsa-sha256; cv=none; b=XsnomVZfkoadtlfQZRjEAnl7tEQWNUsDeF12xuqm838BysejWoAwiJNfXp+OZ+4LM9kG8G Jctn/zW/r43l8LSa5DEU9DyB4KKmHDOYDF463kTkgiGp6leXgNhx5weRG5RGjgChDRXTIo TczgzBdjENK+PeaSZjedV3GUkeXpgvNk5adq3NNR7u7fYiqD4G9jjTfTRrJIzi9gglDmoK k8M5oGVbvUXtDH8RGc7IesJRY7V4bwiEEPgtyU4z/XuakQbxywnaUZJ8N8zL0B/Ph6ZMCn PkhWQ061Z+w1+LYJcF1cVnOuwtnJbTW7Z6evi6B5tvu8E4fu1xju6eqyuM+ZpQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by sunpoet: URL: https://cgit.FreeBSD.org/ports/commit/?id=21b89b758b1c5c57b4ccbb02301da48ba5099753 commit 21b89b758b1c5c57b4ccbb02301da48ba5099753 Author: Po-Chuan Hsieh AuthorDate: 2022-05-14 17:45:13 +0000 Commit: Po-Chuan Hsieh CommitDate: 2022-05-14 17:45:13 +0000 www/libecap: Fix build with Clang 13+ --- www/libecap/files/patch-src-libecap-common-memory.h | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/www/libecap/files/patch-src-libecap-common-memory.h b/www/libecap/files/patch-src-libecap-common-memory.h index db4f9894ee89..74c88a184087 100644 --- a/www/libecap/files/patch-src-libecap-common-memory.h +++ b/www/libecap/files/patch-src-libecap-common-memory.h @@ -1,11 +1,13 @@ --- src/libecap/common/memory.h.orig 2014-10-02 04:05:24 UTC +++ src/libecap/common/memory.h -@@ -4,14 +4,23 @@ +@@ -4,14 +4,28 @@ #define LIBECAP__COMMON_MEMORY_H #include +#if defined(_LIBCPP_VERSION) +#include ++#elif defined(__clang_major__) && __clang_major__ >= 13 ++#include +#else #include +#endif @@ -17,6 +19,9 @@ +#if defined(_LIBCPP_VERSION) +using std::weak_ptr; +using std::shared_ptr; ++#elif defined(__clang_major__) && __clang_major__ >= 13 ++using std::weak_ptr; ++using std::shared_ptr; +#else using std::tr1::weak_ptr; using std::tr1::shared_ptr;