From nobody Tue Oct 15 03:37:55 2024 X-Original-To: dev-commits-ports-branches@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 4XSKYb5HM6z5NnC2; Tue, 15 Oct 2024 03:37:55 +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 "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4XSKYb4gkWz4YRH; Tue, 15 Oct 2024 03:37:55 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1728963475; 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=P4+PKKFe80EQXr8zc2VP9m27bFcO1B2c2Vd8BD3XSR8=; b=mK1Ig0570EzI0slg8BOZT3iu13sLt2sUJIZGZoCWxKKGzNtaCInGymTxqRNeTohkzWNson pSNvV/Mx2yTROQibaPGI252kElPhiJRKjyWNMr1sCxXGkWFfi2r1DFdJWp6tnfJnSaoZ0R GFjehHuhhUrz1d6odPyRY6SU227n0e3uovR+RouJUOAQTegAl0RUJL0DB5TYlekvmmjaOo Z/GlwvtF1Ac4XMBGbklTnX2NC1FF1HC21DurTK0jdZ9rf9XhSWQZOAA4KlUyI3BvrlcPmH vkH+QnfFoNpaGnu488McIL57UZPUed8xCAbPY9BzO7E49UAx/vVPgf4LHIFImQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1728963475; 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=P4+PKKFe80EQXr8zc2VP9m27bFcO1B2c2Vd8BD3XSR8=; b=mjQCt40XX43EncvnEQuCGK27d2h2ZaxNZF6FGwGuSyp3MNQrjWtYxVDR5IZYYGF2jS6Eou Wmhd4DmdJDSABOdPnsYAQtr5jUkWFYxPGkMAYC1vMIMUHnz9yaZ2kmeVTPJJT7A6nhfaJP 8hKnxKJwDhLpdVWKBVKgGOMaO5wQ4x/9QZpIXpYaT4l35UKQ7JEeYh1ShTQWWpK5UP9wek kL51VF2ZuOulz2BjwtE8BTbYkTFa2s900COs0IsQUsHJt2M/UKFU7v9n6d5ErphnvOZNMJ OtwPzLyyiFf2A987O7ildIihAUazJJ8JfZ3O7mpMvfjbFDiMhnRCHEkoKgBDpA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1728963475; a=rsa-sha256; cv=none; b=PtBKvvimG303QD+VnqV7d4fAOJE5+RoBUtiVYyv3WYJe6Ti14W4RYYkoz/PM4mabwDtcnQ CteXDmwKWOVTBSY8qYM5N/22qFRbALqOzuI7tKNluYvIT6Wro0/Hd+JKf1CTNRQC9hyZCi vT+5NL8aIdPhr2MeK6ylLTfD+GIdV3GtaBtbXAovMHWz4eJ8CCT/O5nH5XaaHpbHS4GPp2 tfc7TPfjpVRtXc9uyQkRNqXlcVhevmZ5HlpMzJykPJtUYP8KR5Q360dzn/GFh7+kRJPV9u 5aB6/7+kU7MPA/TK2skZy0shbSMXY1nnPajGIqr4+y0q9b7hRlrcUomlCb/osw== 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 4XSKYb4Bj5z15gQ; Tue, 15 Oct 2024 03:37:55 +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 49F3btek017354; Tue, 15 Oct 2024 03:37:55 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 49F3bt0q017351; Tue, 15 Oct 2024 03:37:55 GMT (envelope-from git) Date: Tue, 15 Oct 2024 03:37:55 GMT Message-Id: <202410150337.49F3bt0q017351@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-branches@FreeBSD.org From: Yuri Victorovich Subject: git: ce57a1a89fb6 - 2024Q4 - devel/sol2: fix dependant ports build failure with clang 18 List-Id: Commits to the quarterly branches of the FreeBSD ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-ports-branches@freebsd.org Sender: owner-dev-commits-ports-branches@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/2024Q4 X-Git-Reftype: branch X-Git-Commit: ce57a1a89fb6b3fb64d93cbb5383a4a6008b3bb1 Auto-Submitted: auto-generated The branch 2024Q4 has been updated by yuri: URL: https://cgit.FreeBSD.org/ports/commit/?id=ce57a1a89fb6b3fb64d93cbb5383a4a6008b3bb1 commit ce57a1a89fb6b3fb64d93cbb5383a4a6008b3bb1 Author: Pavel Timofeev AuthorDate: 2024-10-14 15:02:33 +0000 Commit: Yuri Victorovich CommitDate: 2024-10-15 03:37:52 +0000 devel/sol2: fix dependant ports build failure with clang 18 PR: 282018 (cherry picked from commit 36244079e47839605d7ad2a55edc67ec25784fd3) --- devel/sol2/Makefile | 10 ++++++++- ...atch-include_sol_function__types__stateless.hpp | 24 ++++++++++++++++++++++ 2 files changed, 33 insertions(+), 1 deletion(-) diff --git a/devel/sol2/Makefile b/devel/sol2/Makefile index 5534a858df0f..5add3e1ba977 100644 --- a/devel/sol2/Makefile +++ b/devel/sol2/Makefile @@ -1,6 +1,7 @@ PORTNAME= sol2 DISTVERSIONPREFIX= v DISTVERSION= 4.0.0-alpha +PORTREVISION= 1 CATEGORIES= devel MAINTAINER= yuri@FreeBSD.org @@ -19,4 +20,11 @@ CMAKE_TESTING_ON= SOL2_TESTS NO_ARCH= yes -.include +.include + +.if ${CHOSEN_COMPILER_TYPE} == clang && \ + ${COMPILER_VERSION} >= 180 && ${COMPILER_VERSION} < 190 +EXTRA_PATCHES= ${PATCHDIR}/extra-patch-include_sol_function__types__stateless.hpp +.endif + +.include diff --git a/devel/sol2/files/extra-patch-include_sol_function__types__stateless.hpp b/devel/sol2/files/extra-patch-include_sol_function__types__stateless.hpp new file mode 100644 index 000000000000..631f76037184 --- /dev/null +++ b/devel/sol2/files/extra-patch-include_sol_function__types__stateless.hpp @@ -0,0 +1,24 @@ +--- include/sol/function_types_stateless.hpp.orig 2021-03-06 06:03:23 UTC ++++ include/sol/function_types_stateless.hpp +@@ -320,7 +320,9 @@ namespace sol { namespace function_detail { + } + + template +- static int call(lua_State* L) noexcept(std::is_nothrow_copy_assignable_v) { ++ static int call(lua_State* L) ++ // regression in clang 18 - llvm/llvm-project#91362 ++ { + int nr; + if constexpr (no_trampoline) { + nr = real_call(L); +@@ -360,7 +362,9 @@ namespace sol { namespace function_detail { + } + + template +- static int call(lua_State* L) noexcept(std::is_nothrow_copy_assignable_v) { ++ static int call(lua_State* L) ++ // regression in clang 18 - llvm/llvm-project#91362 ++ { + int nr; + if constexpr (no_trampoline) { + nr = real_call(L);