From nobody Tue Apr 08 08:41:29 2025 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 4ZX0163Mtlz5s2h5; Tue, 08 Apr 2025 08:41:30 +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 4ZX0161m6Tz3H2F; Tue, 08 Apr 2025 08:41:30 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1744101690; 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=/YsJ8zrrt9BDsZuegeIm+SyVRkHDOZ9z2h8Q9eyFpCw=; b=A6r1/grRNtPJ6vezGgN3I7gqb9Ol3/KbS1AUu+xH7dciMuh9N8gxtI2tS6yF4khlMP3jnk 6o9gp4DotSzGQ/9IoLtSuEeEJX0B+t6m+7X35TficZK7O1Uhry0nImSILjwzk3iOLPl2os L5puCTdlngbwzpgAJWxZKGuHb+WudHISpuzzrcGGii/Sua92mMJFZT5ABjyPq5WAEY4Y+k +XzZdbo6FdxrJtpMnnKiq2WP7yE+GsDC1e5iTzEHMgBf6XIN2+4hVaRRTYDq/BfSusNCdg oTd+TIKBVBTAw/qKrWZ/50LdJQo/zmyvm1TVHghYde6cJ2z52nYnkj8c366wqQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1744101690; a=rsa-sha256; cv=none; b=ivAhLiwrNREUbZRGBi9zNuAFYUYcz+rAnQJhyo8Bqt6ZxuxoU8y89asUZMU2VFqpDILdBJ HdIojelb0AX27eqRrGY5cBKZw2x+52GoOkvBczcNl6EfIBwU1vVfcPy8SaIwtTauOK00rE nyUd6tbx14ZnAzmxLtBeUYvl3UytcaMLNqnuybjIOblF+m+V1NBMM0dqqS706DDw6v5gur SbdJZx1JyTgnwwtiurE8jOkYi9db88ptyxOOxjlJvh3SwS73OO9Qx9WIIlMr6bqDPPo6xz ylq+psQZ9rQSXCsu/0Wz22UHfnlW95iMlbnNVpvhM/+f6jc0AbXljCSSI/uwGA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1744101690; 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=/YsJ8zrrt9BDsZuegeIm+SyVRkHDOZ9z2h8Q9eyFpCw=; b=Md8j3KOLLUIuSqD+tv/YiY5P0KpVdmyAmYKTKR3NzNzeCVFIAHeMqmk/GlAz2zQxwWCo/d 1/LOGYvtuRYa8GPnKmeTzFO1IZGmiI4ydn2g9hHhzKnGrNSspZCcQqN3QKvEd8Vt+sIHXL EhMKySU1jGOg5noXPWQnlvvCzdtmr5T532CNkzAgzVapBcfQS4lIf9JxfBbs4djVwhuwnb f60ObJ4N6ZS06pnaNm3gnb6RQ+yEkxewi9SDkT5i9hJmYuo3kWnhfGL5+8+35XTi5Zdxvw A5EEft5Z06ryTnm2N56+GUkA0TSiPr6K2vkR0cMNVe23e1iOAcQsW7k7Yooz6Q== 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 4ZX0160cTyz8WS; Tue, 08 Apr 2025 08:41:30 +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 5388fTWt073879; Tue, 8 Apr 2025 08:41:29 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 5388fTMM073862; Tue, 8 Apr 2025 08:41:29 GMT (envelope-from git) Date: Tue, 8 Apr 2025 08:41:29 GMT Message-Id: <202504080841.5388fTMM073862@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Mikael Urankar Subject: git: 3a88abf6a269 - main - devel/electron34: Fix build with rust 1.86.0 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: mikael X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 3a88abf6a2695a883f8059ef78ee2e97c90e8333 Auto-Submitted: auto-generated The branch main has been updated by mikael: URL: https://cgit.FreeBSD.org/ports/commit/?id=3a88abf6a2695a883f8059ef78ee2e97c90e8333 commit 3a88abf6a2695a883f8059ef78ee2e97c90e8333 Author: Mikael Urankar AuthorDate: 2025-04-08 08:20:40 +0000 Commit: Mikael Urankar CommitDate: 2025-04-08 08:41:11 +0000 devel/electron34: Fix build with rust 1.86.0 PR: 285840 Approved by: portmgr (build fix blanket) --- .../electron34/files/patch-build_rust_std_BUILD.gn | 26 ++++++++++++++++++++-- 1 file changed, 24 insertions(+), 2 deletions(-) diff --git a/devel/electron34/files/patch-build_rust_std_BUILD.gn b/devel/electron34/files/patch-build_rust_std_BUILD.gn index f40de14fbd97..473f4c097e4b 100644 --- a/devel/electron34/files/patch-build_rust_std_BUILD.gn +++ b/devel/electron34/files/patch-build_rust_std_BUILD.gn @@ -1,6 +1,28 @@ ---- build/rust/std/BUILD.gn.orig 2024-08-14 20:54:23 UTC +--- build/rust/std/BUILD.gn.orig 2025-04-05 13:54:50 UTC +++ build/rust/std/BUILD.gn -@@ -100,7 +100,6 @@ if (toolchain_has_rust) { +@@ -89,13 +89,20 @@ if (toolchain_has_rust) { + # These are no longer present in the Windows toolchain. + stdlib_files += [ + "addr2line", +- "adler", + "gimli", + "libc", + "memchr", + "miniz_oxide", + "object", + ] ++ ++ rust_revision_pieces = string_split(rustc_revision, " ") ++ rust_version_pieces = string_split(rust_revision_pieces[1], ".") ++ if (rust_version_pieces[1] == "85") { ++ stdlib_files += [ "adler" ] ++ } else { ++ stdlib_files += [ "adler2" ] ++ } + } + + if (toolchain_for_rust_host_build_tools) { +@@ -115,7 +122,6 @@ if (toolchain_has_rust) { # don't need to pass to the C++ linker because they're used for specialized # purposes. skip_stdlib_files = [