From nobody Tue Apr 26 19:13:16 2022 X-Original-To: dev-commits-ports-main@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 854941999CAC; Tue, 26 Apr 2022 19:13:16 +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 4Kns3c36Lyz3prY; Tue, 26 Apr 2022 19:13:16 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1651000396; 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=Lp3wBtdgczhrv/q1ucuMdb5csgzC5x2WsaqnOEcD6LY=; b=B86cmEjK0XIWZejJmvJ8/OE43bEiYPlSOPVujdfALx6mvY8YHX3DxepJxja0CANqkZ8WUZ VIS42btPcg1gqeOHRnogWtIHGPABCuvIIIyun0Ys/RL73xq3LjEBw0aEOc0W8snmehdvHe hdGcEbd/K8kfBt/fVa7SM26Hg3SCIbwWIEIrFj1T7yolFJQCuq4YqZLwwEKuw0WIfy8gLI g3KP7lQ1GlGsHVtaoxnknh85DkXBzAi4CmhI89akhPG017WpUSW0gBMEYeedJAVrxtN5gq sv6NUZQewPHxo8c0zBuhX4KBPUrQgpa5suyc8Txj/Pk5N1zPGYoHp1HKcboawA== 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 4B6851543A; Tue, 26 Apr 2022 19:13:16 +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 23QJDGkZ083926; Tue, 26 Apr 2022 19:13:16 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 23QJDG4A083925; Tue, 26 Apr 2022 19:13:16 GMT (envelope-from git) Date: Tue, 26 Apr 2022 19:13:16 GMT Message-Id: <202204261913.23QJDG4A083925@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Dimitry Andric Subject: git: 97936b3d67af - main - devel/heimdall: stop attempting to define nullptr List-Id: Commits to the main branch of the FreeBSD ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-main@freebsd.org X-BeenThere: dev-commits-ports-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: dim X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 97936b3d67af0be32750eb83edc3170bd01f9755 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1651000396; 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=Lp3wBtdgczhrv/q1ucuMdb5csgzC5x2WsaqnOEcD6LY=; b=yoLbUGulWvpgGYnZmbguQ6TDQspTjpahDDB5LmIYxF65NqEAjliur4IbHGOe+pjmw70RX5 vElU8i0/Nb4bZGYs/bQnXt3BS6LFEfEYAGnmiDNKW1cqHo6AFX4m6uzuUbfSLx1oeKoZqo 2GAqZlJFyHyqRaL3mC2ojmMWRzayicxygwH/njSIsHjDpzrJszQkppRfzsL7yOphwv6IHD 2KqxBZUg28IiMcTN82soJvXYsyY0nu1LXgJzFYn8CDbm7jbLKCyubvEwKHXCbnSMk8Uo/Y lbpRCB9voxCfupc5FCyMpEEn+6ZqG90Bz/vJkLglPEToFVlJxkRlTy0iVAnMrg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1651000396; a=rsa-sha256; cv=none; b=QJ0UcvE2AYiC6zBKhKbh4GBi4MdoXmz+KGUU5LFy1lUzfxZyaX7j6N+rDmS7J4KMbEyeWh tmM4WLNOzWsZD/8TyJL31Gk3JWuPxsYDfrDTyaliuXA23fJauu3eCYIifENJFyBQ+bZ/Hc zOrUSIhes1YNeL1AMQvu4CudA1LH5brqYHo6vXR+GQF61jEsrBNAF5O9MvF/BjIli6RuMI AX4SUpmsKsG+l7nnYlreQuiFibLTehjMCI851jLzZ1iG4kjXS3C8SGqJmlmwUz2QoPjMDi 4qqecj2vmLQ8lgSXJ4tfg9Hmir0RtorXxP4iNFC/GgrUTqC0zEae15CWDNoxYQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by dim (src committer): URL: https://cgit.FreeBSD.org/ports/commit/?id=97936b3d67af0be32750eb83edc3170bd01f9755 commit 97936b3d67af0be32750eb83edc3170bd01f9755 Author: Dimitry Andric AuthorDate: 2022-04-09 11:24:31 +0000 Commit: Dimitry Andric CommitDate: 2022-04-26 19:11:50 +0000 devel/heimdall: stop attempting to define nullptr During an exp-run for llvm 14 (see bug 261742), it turned out that devel/heimdall fails to build with libc++ 14: In file included from /wrkdirs/usr/ports/devel/heimdall/work/Heimdall-1.4.2/heimdall/source/HelpAction.cpp:24: In file included from /wrkdirs/usr/ports/devel/heimdall/work/Heimdall-1.4.2/heimdall/source/Interface.h:25: In file included from /usr/include/c++/v1/map:535: In file included from /usr/include/c++/v1/__node_handle:63: In file included from /usr/include/c++/v1/memory:819: In file included from /usr/include/c++/v1/__memory/ranges_uninitialized_algorithms.h:22: In file included from /usr/include/c++/v1/__memory/uninitialized_algorithms.h:17: In file included from /usr/include/c++/v1/iterator:591: In file included from /usr/include/c++/v1/__iterator/common_iterator.h:22: In file included from /usr/include/c++/v1/variant:204: /usr/include/c++/v1/__functional/hash.h:174:12: error: no matching constructor for initialization of 'pair' return pair<_Size, _Size>(__a + __z, __b + __c); ^ ~~~~~~~~~~~~~~~~~~~~ /usr/include/c++/v1/__functional/hash.h:182:12: note: in instantiation of member function 'std::__murmur2_or_cityhash::__weak_hash_len_32_with_seeds' requested here return __weak_hash_len_32_with_seeds(__loadword<_Size>(__s), ^ /usr/include/c++/v1/__functional/hash.h:241:28: note: in instantiation of member function 'std::__murmur2_or_cityhash::__weak_hash_len_32_with_seeds' requested here pair<_Size, _Size> __v = __weak_hash_len_32_with_seeds(__s + __len - 64, __len, __z); ^ /usr/include/c++/v1/__functional/hash.h:344:16: note: in instantiation of member function 'std::__murmur2_or_cityhash::operator()' requested here return __murmur2_or_cityhash()(&__u, sizeof(__u)); ^ /usr/include/c++/v1/__functional/hash.h:418:20: note: in instantiation of member function 'std::__scalar_hash::operator()' requested here return _HashT()(__p); ^ /usr/include/c++/v1/__utility/pair.h:157:14: note: candidate template ignored: requirement '_CheckArgsDep::__enable_explicit()' was not satisfied [with _Dummy = true] explicit pair(_T1 const& __t1, _T2 const& __t2) ^ [... much more of this ...] This is because Heimdall.h defines nullptr as a macro with value 0, which isn't compatible with C++11 or later. PR: 263176 Approved by: ehaupt (maintainer) MFH: 2022Q2 --- devel/heimdall/files/patch-heimdall_source_Heimdall.h | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/devel/heimdall/files/patch-heimdall_source_Heimdall.h b/devel/heimdall/files/patch-heimdall_source_Heimdall.h new file mode 100644 index 000000000000..c20fccf6aa43 --- /dev/null +++ b/devel/heimdall/files/patch-heimdall_source_Heimdall.h @@ -0,0 +1,15 @@ +--- heimdall/source/Heimdall.h.orig 2017-05-11 18:34:25 UTC ++++ heimdall/source/Heimdall.h +@@ -54,12 +54,4 @@ + + #endif + +-#if (!(defined _MSC_VER) || (_MSC_VER < 1700)) +- +-#ifndef nullptr +-#define nullptr 0 +-#endif +- +-#endif +- + #endif