From nobody Sun Jun 23 14:53:48 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 4W6Yy432WFz5PdNs; Sun, 23 Jun 2024 14:53:48 +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 4W6Yy42bwFz4rgv; Sun, 23 Jun 2024 14:53:48 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1719154428; 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=OYp5jhdXNIJxGnimPT2Mzgmb4ONSYx+2R9g+/gKwOic=; b=FBCiQ6RkDTUhB2I9/wS3kSAKV2M51p0xQJnDtl9MFu/ebsa+IFnScx4POw2ih4O1JiqQAP EQoBZIGHFJk5imvcvMSQqG1D6L5mxoHvPUZYdOxNKSsmY3TE1D1u42I6mh88EgvNByOuwe R9cih2VY5m1U7NHw1MspA6b3Egh8Dh0/wFcfFe332VKM4PdRsKWLSh84MyYSde1HojTcyQ RFYfXXR2FZH7FAMVPzZclaj6TsGd7JwARBqBezogmWmEKYF1ZLrJdJEYmyDMeL0rU1pNGP qMa120hiGPbMa/JNAhGwhDtO6lciU9H3VqspVEqRZEzxnw5MHSD7u90kJPRALQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1719154428; a=rsa-sha256; cv=none; b=UxED47OGKJSEdyGlSmZpmhNUq1XglR9+my6Tr6B+SFLrts1V5NYkCwdPq2EJw6Cd/aYaRl lc0fd3SE6zeHP0Ni4tELfv7605hLI/2GQqs32bARSA11GunvTBf20kCuCiZCQniCPYMmAC Lnpb7LgREFkD8sYdY+g26vPom+zkmUS68YIlkchIff/bv1OwHdUQ/8Ir7PPimW0GJbJ/M6 Y3/IWDi+ZCP31Awa78qRFGh36jJkRUY2KJt1NFi80r8pLQe/PAOUx7TJtC6mLkSs51N7wx pTbZgmCvx36MvQAGzbU1XKR3uiitiopnofDFDAi8Pz1r8Xhg30e/0hd8qlCxYQ== 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=1719154428; 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=OYp5jhdXNIJxGnimPT2Mzgmb4ONSYx+2R9g+/gKwOic=; b=CdRsdJWDupRc+rK3sfGGuoYSzWz8lgG/9e2V1mz0toV5W2I8xp/j0HNQdBGHwlxObBAYSH 5SfOFgIGN6sMgh+if7Fda22+ctMYLIv+Z/T69QVxdKZiVudQBju5FTPPRh4ne4YOheeJHn 32TD+zoJBjS9yq4aUReG33Hi/8RVOoNOmgYrhAca/vN2pp0rJoNbCmStEkhC9IaCbjyvHQ zYM+cPB+xkf70iIHWA1+LI2t7/dGSMx2hnC6QLDfFUZiuXpvHQeGgvhRIAL0cSrkqzFoaS SsU0UL9zsPz7x2VxovpJBCnGrUCHcX86WQgm8keuZC/yMecrdCzru5v6fKMSKg== 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 4W6Yy42CMyzfnX; Sun, 23 Jun 2024 14:53:48 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 45NErm88071906; Sun, 23 Jun 2024 14:53:48 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 45NErmVx071903; Sun, 23 Jun 2024 14:53:48 GMT (envelope-from git) Date: Sun, 23 Jun 2024 14:53:48 GMT Message-Id: <202406231453.45NErmVx071903@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: 2f482fb4b131 - main - lang/rust: Attempt to fix build on armv7 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: 2f482fb4b131052bf7ae55704b7d7200e7a11e69 Auto-Submitted: auto-generated The branch main has been updated by mikael: URL: https://cgit.FreeBSD.org/ports/commit/?id=2f482fb4b131052bf7ae55704b7d7200e7a11e69 commit 2f482fb4b131052bf7ae55704b7d7200e7a11e69 Author: Mikael Urankar AuthorDate: 2024-06-23 14:51:30 +0000 Commit: Mikael Urankar CommitDate: 2024-06-23 14:51:30 +0000 lang/rust: Attempt to fix build on armv7 Reported by: mandree,mmel --- ...h-vendor_rustix_src_backend_libc_fs_syscalls.rs | 24 ++++++++++++++++++++++ 1 file changed, 24 insertions(+) diff --git a/lang/rust/files/armv7/patch-vendor_rustix_src_backend_libc_fs_syscalls.rs b/lang/rust/files/armv7/patch-vendor_rustix_src_backend_libc_fs_syscalls.rs new file mode 100644 index 000000000000..b379aae77f08 --- /dev/null +++ b/lang/rust/files/armv7/patch-vendor_rustix_src_backend_libc_fs_syscalls.rs @@ -0,0 +1,24 @@ +gnueabihf was changed to gnu in this commit and it breaks rustix +https://github.com/rust-lang/rust/commit/93ec0e6299e31e6857e8ad741750034f35762b11 + + +--- vendor/rustix-0.38.28/src/backend/libc/fs/syscalls.rs.orig 2024-05-06 16:29:17.182875000 +0200 ++++ vendor/rustix-0.38.28/src/backend/libc/fs/syscalls.rs 2024-05-06 16:29:48.897744000 +0200 +@@ -140,7 +140,7 @@ pub(crate) fn open(path: &CStr, oflags: OFlags, mode: + pub(crate) fn open(path: &CStr, oflags: OFlags, mode: Mode) -> io::Result { + // Work around . + // glibc versions before 2.25 don't handle `O_TMPFILE` correctly. +- #[cfg(all(unix, target_env = "gnu", not(target_os = "hurd")))] ++ #[cfg(all(unix, target_env = "gnu", not(any(target_os = "freebsd", target_os = "hurd"))))] + if oflags.contains(OFlags::TMPFILE) && crate::backend::if_glibc_is_less_than_2_25() { + return open_via_syscall(path, oflags, mode); + } +@@ -203,7 +203,7 @@ pub(crate) fn openat( + ) -> io::Result { + // Work around . + // glibc versions before 2.25 don't handle `O_TMPFILE` correctly. +- #[cfg(all(unix, target_env = "gnu", not(target_os = "hurd")))] ++ #[cfg(all(unix, target_env = "gnu", not(any(target_os = "freebsd", target_os = "hurd"))))] + if oflags.contains(OFlags::TMPFILE) && crate::backend::if_glibc_is_less_than_2_25() { + return openat_via_syscall(dirfd, path, oflags, mode); + }