From nobody Sun Dec 15 06:25:20 2024 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 4Y9tNc45b4z5hLqQ; Sun, 15 Dec 2024 06:25:20 +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 "R10" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Y9tNc1KwGz4CpJ; Sun, 15 Dec 2024 06:25:20 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1734243920; 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=19WxC/Y9Ifv0TzDDJjxqIJJTiStecBY6wOFtD9qvq18=; b=oODTs4DtD8DTAdlNjTArpxP5pjXQp0qu2JbMGX8QlVEPQuesBZtCKAfSlmq/eVhSEWBu6N qsc7Mqh8sDnZECQlkYRU+JOp9cwTk64XeZPr2nAwgzzZW8cCZ2HoEVe6/2Trqmn6Alra2Q CuRrhzTTJZSJn9wDCSya0PGLuMvNzvm/ZJ7PYyAib8/FaCjmDssoQaezwNVym/gEypxLdb Iws3dI+KlQ1h7wRx9EyepHlKULWgldYcwZH39XWlP2o3hqGe0FPy/j7wOcQi5KuxRINF6a x8dllJOHzTeBatP2CMT5BgeEKAOcuuAY8o5/maoMf/7OmpqCJWkqGkTmX0iePg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1734243920; 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=19WxC/Y9Ifv0TzDDJjxqIJJTiStecBY6wOFtD9qvq18=; b=vbK0XCRndsk6iHQ9GOs+h+yEQPo/lRJlVEiVVUyo8Tcllb3qLzrfHebQbH1TaWIhTtiKff 3Pz8D9rwjYe51UE73w7pPE7W0IrHnQLt56WJnYrrMxbPOHMIPuBj+d5copNM0uu7Y/05IU PzB1NZgqrS8pY9Qe5XOdTLeVxbtN4+frg/sYDf6m+LN4o7k9KeqhaFjcaR8bgCzjorXH42 o2BDwW9TdxUtiXLwgFfNXwRhhIBGw4VCS6ERd/qvCMicAICZKDY8jc7iINxWyObQpZ+rNB g1qDNZ0HC04/7/RapDhNriGXvUUy8YlM+paB8L80hlEob4FtWCoAHuGATVyKqQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1734243920; a=rsa-sha256; cv=none; b=YjbO9mREGVo8P5kepIR+IgzlJwqn4bjs/lOYeBaTMjSpc0RcmaSguQtKoDWKxyXdiELBaH vkP0LCSeQpGKxKaUvkjyGp/KXK6mrBbvwOMMpkpdzsVrG8q0qnqkDblTVGnjwpZn4ttrjj 0J9e5KQMFIetbfMdPpaXaTMnuii7JNgCXfSQ9uvB4PTnWLKJ+utS8Pfekiruij1Bhr1BXp Seq1f4C4n6XsUjpK2F+UQqzZKn73rgE6qqFSxANJBpbtizwtrTIixRF4pnyBXR+CkiT+Mw xIAxp39BaH1yVCJ1uOeaEV7jlDptlrCPFUfXWIBnXBiXCMwP6+xfkZQ5Stmwyg== 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 4Y9tNc0s5qzx7R; Sun, 15 Dec 2024 06:25:20 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 4BF6PKb4034680; Sun, 15 Dec 2024 06:25:20 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 4BF6PKr8034677; Sun, 15 Dec 2024 06:25:20 GMT (envelope-from git) Date: Sun, 15 Dec 2024 06:25:20 GMT Message-Id: <202412150625.4BF6PKr8034677@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Yuri Victorovich Subject: git: 2abe162d6320 - main - devel/sol2: Fix compilation for clang 19.1 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: X-BeenThere: dev-commits-ports-all@freebsd.org Sender: owner-dev-commits-ports-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: yuri X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 2abe162d63206ff8004471e9c6a4152960084dcc Auto-Submitted: auto-generated The branch main has been updated by yuri: URL: https://cgit.FreeBSD.org/ports/commit/?id=2abe162d63206ff8004471e9c6a4152960084dcc commit 2abe162d63206ff8004471e9c6a4152960084dcc Author: Peter Laursen AuthorDate: 2024-12-15 06:21:44 +0000 Commit: Yuri Victorovich CommitDate: 2024-12-15 06:25:08 +0000 devel/sol2: Fix compilation for clang 19.1 PR: 283287 --- devel/sol2/Makefile | 7 ++++++- .../extra-patch-include_sol_optional__implementation.hpp | 12 ++++++++++++ 2 files changed, 18 insertions(+), 1 deletion(-) diff --git a/devel/sol2/Makefile b/devel/sol2/Makefile index 5add3e1ba977..cf0a23a4465e 100644 --- a/devel/sol2/Makefile +++ b/devel/sol2/Makefile @@ -1,7 +1,7 @@ PORTNAME= sol2 DISTVERSIONPREFIX= v DISTVERSION= 4.0.0-alpha -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= devel MAINTAINER= yuri@FreeBSD.org @@ -27,4 +27,9 @@ NO_ARCH= yes EXTRA_PATCHES= ${PATCHDIR}/extra-patch-include_sol_function__types__stateless.hpp .endif +.if ${CHOSEN_COMPILER_TYPE} == clang && \ + ${COMPILER_VERSION} >= 191 +EXTRA_PATCHES= ${PATCHDIR}/extra-patch-include_sol_optional__implementation.hp +.endif + .include diff --git a/devel/sol2/files/extra-patch-include_sol_optional__implementation.hpp b/devel/sol2/files/extra-patch-include_sol_optional__implementation.hpp new file mode 100644 index 000000000000..809f9ae51cf1 --- /dev/null +++ b/devel/sol2/files/extra-patch-include_sol_optional__implementation.hpp @@ -0,0 +1,12 @@ +--- include/sol/optional_implementation.hpp.orig 2024-12-13 07:59:32 UTC ++++ include/sol/optional_implementation.hpp +@@ -2191,7 +2191,8 @@ namespace sol { + static_assert(std::is_constructible::value, "T must be constructible with Args"); + + *this = nullopt; +- this->construct(std::forward(args)...); ++ new (static_cast(this)) optional(std::in_place, std::forward(args)...); ++ return **this; + } + + /// Swaps this optional with the other.