From nobody Fri Nov 8 08:24:29 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 4XlBn94Bzrz5cNWh; Fri, 08 Nov 2024 08:24:29 +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 4XlBn93gcWz590v; Fri, 8 Nov 2024 08:24:29 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1731054269; 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=1/Ds+4XsNHfR6Hf8Yy8hK6AbPoNL+hgSxbT0VMx+g8U=; b=ALqx4gMW88Xu5luZ+np2qVKV50hDHP064EmrBR2bVBqCKxefh2GeNlqK6G1aibHW12Qt4x RP12WbL+Pxbhj/zIH99P5ZTUMiE5kGCqAWMoxqSTLvvOm8TmlMgrwC0OwC90SIQSg/NyqP kFDuR3VD+7nYjSmwUBSuNcSt5TvksxLAJHhgQcuxBhlGf1W5jH1N+VtOvOnC4MSzGIWcWA xPemX/IMkBo7cQztjPwj0TFYtsSMtvON4lT5ZwTss/7GGuwDbAh36LAtcxTMKqPVB5j2SV O/jMYRAByl4sZy8qwD3241T5cPLkaH/N9IyuWKOeZrSw7tKmKVjQp3ntNcHQCQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1731054269; 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=1/Ds+4XsNHfR6Hf8Yy8hK6AbPoNL+hgSxbT0VMx+g8U=; b=mD0nd4JEyIq62vdBFTH6YK35OWOyW/jRtbI3+knHC5il4SLg8dcW1tn0rLDlVu5gaTZFsC VQTz8jikTnBcWgtF9zKMN2IwQCN7eGiDgZwRUsAnbJmnWejepMMcrGiMGcOncML5/8TIFZ IhlpXXgyghhDKA8RMxtvL1u4rw43GK5z/34ut3lghiib5zqz07pYcxI45U14zL0DYCHlgq xZzdqUoW+KpoJtYXNI5mrfD4XYsZWV3tqZm0cZD+YfK/iALN6oEvbtUHa4G19NfP8cpqvE 8pmjyAlAO9ijwRUDWgeL2BywdLKP8ZepmPfTSV3MkNezqYLANaPHgjKKC9+lyA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1731054269; a=rsa-sha256; cv=none; b=jutkZISpIDyL6ZmlMTuZgduzuW7XF5l8Tv1YrMZil/G4tOJpqA/5Zgu2bLCsWUQDA2wesc 7skruLI6lhxW9pl9HSJuxfZ0bbo4cu11UQXb1Zb3j1GuGJBMmsEfJQ7HaM+GYkglSa3F0V TDla6qD9WrATeXiRsNFxvrBalEgV8OBgfjSG8SX1HW8b2yNkDweH1qb0J5lfN0Iy12px+8 bpbzh0fQc5rSe/HwJIYB72otTKzbvKe+7DJ4Y3HdlAgElCuq+t+ccB/ZrduhJdHgmVsicY Ef505cvA6t19ySBKbU7lblYV7SiTQ7OwwNruePS7qP9TeFmifqTOGE65GE0d7Q== 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 4XlBn93FJ2zMCV; Fri, 8 Nov 2024 08:24:29 +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 4A88OTFk037047; Fri, 8 Nov 2024 08:24:29 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 4A88OTE9037044; Fri, 8 Nov 2024 08:24:29 GMT (envelope-from git) Date: Fri, 8 Nov 2024 08:24:29 GMT Message-Id: <202411080824.4A88OTE9037044@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: 05961664b7f0 - main - lang/rust: drop "gnu" in the target env for armv6/7 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: mikael X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 05961664b7f01ac5ed3e9352d43c2aa1ae3028b5 Auto-Submitted: auto-generated The branch main has been updated by mikael: URL: https://cgit.FreeBSD.org/ports/commit/?id=05961664b7f01ac5ed3e9352d43c2aa1ae3028b5 commit 05961664b7f01ac5ed3e9352d43c2aa1ae3028b5 Author: Mikael Urankar AuthorDate: 2024-10-31 17:10:09 +0000 Commit: Mikael Urankar CommitDate: 2024-11-08 08:24:19 +0000 lang/rust: drop "gnu" in the target env for armv6/7 PR: 282518 --- ...h-vendor_rustix_src_backend_libc_fs_syscalls.rs | 24 ---------------------- ...get_src_spec_targets_armv6__unknown__freebsd.rs | 10 +++++++++ ...get_src_spec_targets_armv7__unknown__freebsd.rs | 10 +++++++++ .../patch-vendor_nix-0.28.0_src_sys_signal.rs | 20 ------------------ 4 files changed, 20 insertions(+), 44 deletions(-) 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 deleted file mode 100644 index b379aae77f08..000000000000 --- a/lang/rust/files/armv7/patch-vendor_rustix_src_backend_libc_fs_syscalls.rs +++ /dev/null @@ -1,24 +0,0 @@ -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); - } diff --git a/lang/rust/files/patch-compiler_rustc__target_src_spec_targets_armv6__unknown__freebsd.rs b/lang/rust/files/patch-compiler_rustc__target_src_spec_targets_armv6__unknown__freebsd.rs new file mode 100644 index 000000000000..362f599f47f5 --- /dev/null +++ b/lang/rust/files/patch-compiler_rustc__target_src_spec_targets_armv6__unknown__freebsd.rs @@ -0,0 +1,10 @@ +--- compiler/rustc_target/src/spec/targets/armv6_unknown_freebsd.rs.orig 2024-10-31 18:07:58.495590000 +0100 ++++ compiler/rustc_target/src/spec/targets/armv6_unknown_freebsd.rs 2024-10-31 18:08:05.438220000 +0100 +@@ -14,7 +14,6 @@ pub fn target() -> Target { + arch: "arm".into(), + options: TargetOptions { + abi: "eabihf".into(), +- env: "gnu".into(), + features: "+v6,+vfp2,-d32".into(), + max_atomic_width: Some(64), + mcount: "\u{1}__gnu_mcount_nc".into(), diff --git a/lang/rust/files/patch-compiler_rustc__target_src_spec_targets_armv7__unknown__freebsd.rs b/lang/rust/files/patch-compiler_rustc__target_src_spec_targets_armv7__unknown__freebsd.rs new file mode 100644 index 000000000000..4ec4c69c94d4 --- /dev/null +++ b/lang/rust/files/patch-compiler_rustc__target_src_spec_targets_armv7__unknown__freebsd.rs @@ -0,0 +1,10 @@ +--- compiler/rustc_target/src/spec/targets/armv7_unknown_freebsd.rs.orig 2024-10-31 18:07:51.199947000 +0100 ++++ compiler/rustc_target/src/spec/targets/armv7_unknown_freebsd.rs 2024-10-31 18:08:14.463398000 +0100 +@@ -14,7 +14,6 @@ pub fn target() -> Target { + arch: "arm".into(), + options: TargetOptions { + abi: "eabihf".into(), +- env: "gnu".into(), + features: "+v7,+vfp3,-d32,+thumb2,-neon".into(), + max_atomic_width: Some(64), + mcount: "\u{1}__gnu_mcount_nc".into(), diff --git a/lang/rust/files/patch-vendor_nix-0.28.0_src_sys_signal.rs b/lang/rust/files/patch-vendor_nix-0.28.0_src_sys_signal.rs deleted file mode 100644 index fbe6d4e5a216..000000000000 --- a/lang/rust/files/patch-vendor_nix-0.28.0_src_sys_signal.rs +++ /dev/null @@ -1,20 +0,0 @@ ---- vendor/nix-0.28.0/src/sys/signal.rs.orig 2024-06-14 14:06:00 UTC -+++ vendor/nix-0.28.0/src/sys/signal.rs -@@ -1099,7 +1099,7 @@ pub type type_of_thread_id = libc::lwpid_t; - #[cfg(target_os = "freebsd")] - pub type type_of_thread_id = libc::lwpid_t; - /// Identifies a thread for [`SigevNotify::SigevThreadId`] --#[cfg(all(not(target_os = "hurd"), any(target_env = "gnu", target_env = "uclibc")))] -+#[cfg(all(not(any(target_os = "freebsd", target_os = "hurd")), any(target_env = "gnu", target_env = "uclibc")))] - pub type type_of_thread_id = libc::pid_t; - - /// Specifies the notification method used by a [`SigEvent`] -@@ -1349,7 +1349,7 @@ mod sigevent { - sev.sigev_value.sival_ptr = si_value as *mut libc::c_void; - sev._sigev_un._threadid = thread_id; - } -- #[cfg(any(target_env = "gnu", target_env = "uclibc"))] -+ #[cfg(all(not(target_os = "freebsd"), any(target_env = "gnu", target_env = "uclibc")))] - SigevNotify::SigevThreadId{signal, thread_id, si_value} => { - sev.sigev_notify = libc::SIGEV_THREAD_ID; - sev.sigev_signo = signal as libc::c_int;