From nobody Mon Oct 14 17:08:39 2024 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 4XS3bW6hwdz5Yrpd; Mon, 14 Oct 2024 17:08:39 +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 4XS3bW669Yz4bRZ; Mon, 14 Oct 2024 17:08:39 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1728925719; 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=T7lYZR383O1RIMcsQHoYbihWfLRLq12B9XgM3VRHA68=; b=rl1rKnrXDmz0HzSGlpP6arPYF2TAal5x1PLq9Ev/YNdbDuSei24DLVDw4UJlPL7StV51RH 1RZbft2oIe90H+PkTWPjaDopK+R3Ww9nQtcdOrby4FNryjoW5jn4NDB/FiRajCJwk6sjFC y4/sNFWvCTmk1z1RViPgM6bZSYlheWekdjWzjSlwM+MrQqGaQuyX9ZvudTRJEv5CH2Azaz MV8kvXS6j2Bc6TUJ1GZaEcbAtEpcToFw8sgJjqjtbJPGBU73Qa7TlEESaixfY0ASzt9lkB T8lBZM35zWpppQxJZDVRpG25PVLFrp8KjBS7LU+avHRU0OCtIPzwBQOk/ZR+dg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1728925719; 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=T7lYZR383O1RIMcsQHoYbihWfLRLq12B9XgM3VRHA68=; b=Cq1hQF3fCgg+8T0MfQkjVRM9nlhPTz8OWqj0eBjC3g4w1BpnGWu8kP5ojybNTBhbmec6ID DC2EaRGoGqN+wuSUUqzDpmfvJzyaYgvIqxVCEgIISqBZgK37Inn5AE8MU5O/b1U95dRvgS +32z7ceF3KaAKVFnjqdKaDRlIe2nTRkEN0bzuoC3Jn9o8zM3/0gKAmrC9rKBqsI2JoUSis hY8erLb9N0wmCfiaA8iT64b6d7npfQJovD9CR2VHmYAWK8QOgoOP0ERr4uzSQwteAFNEVq o6weBbsx1xRo1F68Vn3AzLuBq7+rY/koxSJkzyAHj2zol3pgBA7zFii6c6/T3w== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1728925719; a=rsa-sha256; cv=none; b=IXMF0sJdmN+mUdHXx2SOMo9lq52H3q77ty03KM/khdKvmvkdNrwG3KLLv2+boybj2vrsKm RLpSAyxsZQ9DQzcTTvQ9vo6ArGqnOfLvz/FAvKFF0l94pNHMIzX0GKjTPWjXs48SqJVEbl Xl65wiyHIRVAhm+ICAQ38j6Y7dzxTzALFMlj203lDcZd2TX4qLs2Ywhbq3lxHl0cc5roLn Aysn9RZcaiZIxdsq0cPTJH/PKNWLdPVG3TAwOiyhtvTtgxWPINaXmhHwZy9Wc25QfKhtop 9NDxyJ0hXyjMBVpqTTyqdtijS0WLVzRffffWndz+7ibW3iZY0c46Zxlk6rVtPw== 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 4XS3bW5YGZzmmn; Mon, 14 Oct 2024 17:08:39 +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 49EH8dfC048335; Mon, 14 Oct 2024 17:08:39 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 49EH8dWT048332; Mon, 14 Oct 2024 17:08:39 GMT (envelope-from git) Date: Mon, 14 Oct 2024 17:08:39 GMT Message-Id: <202410141708.49EH8dWT048332@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: 36244079e478 - main - devel/sol2: fix dependant ports build failure with clang 18 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: X-BeenThere: dev-commits-ports-main@freebsd.org Sender: owner-dev-commits-ports-main@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: 36244079e47839605d7ad2a55edc67ec25784fd3 Auto-Submitted: auto-generated The branch main has been updated by yuri: URL: https://cgit.FreeBSD.org/ports/commit/?id=36244079e47839605d7ad2a55edc67ec25784fd3 commit 36244079e47839605d7ad2a55edc67ec25784fd3 Author: Pavel Timofeev AuthorDate: 2024-10-14 15:02:33 +0000 Commit: Yuri Victorovich CommitDate: 2024-10-14 17:08:37 +0000 devel/sol2: fix dependant ports build failure with clang 18 PR: 282018 --- 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);