Skip site navigation (1)Skip section navigation (2)
Date:      Fri, 22 Nov 2024 08:42:57 GMT
From:      Mikael Urankar <mikael@FreeBSD.org>
To:        ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org
Subject:   git: c348a547923c - main - lang/rust: Fix build on armv7
Message-ID:  <202411220842.4AM8gvAr068959@gitrepo.freebsd.org>

next in thread | raw e-mail | index | archive | help
The branch main has been updated by mikael:

URL: https://cgit.FreeBSD.org/ports/commit/?id=c348a547923c25a771d0d2a5db796103e25511ec

commit c348a547923c25a771d0d2a5db796103e25511ec
Author:     Mikael Urankar <mikael@FreeBSD.org>
AuthorDate: 2024-11-22 08:40:03 +0000
Commit:     Mikael Urankar <mikael@FreeBSD.org>
CommitDate: 2024-11-22 08:40:03 +0000

    lang/rust: Fix build on armv7
    
    PR:             282663
---
 lang/rust/distinfo                                           | 12 ++++++------
 .../patch-compiler_rustc__target_src_spec_base_freebsd.rs    | 11 +++++++++++
 2 files changed, 17 insertions(+), 6 deletions(-)

diff --git a/lang/rust/distinfo b/lang/rust/distinfo
index 14992f681100..ffbc0867d0ec 100644
--- a/lang/rust/distinfo
+++ b/lang/rust/distinfo
@@ -13,12 +13,12 @@ SHA256 (rust/2024-09-05/rust-std-1.81.0-x86_64-unknown-freebsd.tar.xz) = dd34a1f
 SIZE (rust/2024-09-05/rust-std-1.81.0-x86_64-unknown-freebsd.tar.xz) = 26944964
 SHA256 (rust/2024-09-05/cargo-1.81.0-x86_64-unknown-freebsd.tar.xz) = 0e2578c6d00860bcfcb7f7f55a85a162d98538c8c4ad856cfa0fe8cacf64a564
 SIZE (rust/2024-09-05/cargo-1.81.0-x86_64-unknown-freebsd.tar.xz) = 10321608
-SHA256 (rust/2024-09-05/rustc-1.81.0-armv7-unknown-freebsd.tar.xz) = a9c8db8fc55fa5bb7fb6ef590298eb19cbe9787af6553accdea54df6a0973386
-SIZE (rust/2024-09-05/rustc-1.81.0-armv7-unknown-freebsd.tar.xz) = 61737980
-SHA256 (rust/2024-09-05/rust-std-1.81.0-armv7-unknown-freebsd.tar.xz) = db64d80b3143d87da5ff569d328186ee1bc792c091a39e9223a9677cd014983f
-SIZE (rust/2024-09-05/rust-std-1.81.0-armv7-unknown-freebsd.tar.xz) = 25718520
-SHA256 (rust/2024-09-05/cargo-1.81.0-armv7-unknown-freebsd.tar.xz) = 4ee09452940556136b5af431e6a758512e8b583e19e093d6945241ebd73ba016
-SIZE (rust/2024-09-05/cargo-1.81.0-armv7-unknown-freebsd.tar.xz) = 9321956
+SHA256 (rust/2024-09-05/rustc-1.81.0-armv7-unknown-freebsd.tar.xz) = c13982b87ae60cbe4fe6ddfa96cded7293c0d59011816e6f89cdfa4531964eea
+SIZE (rust/2024-09-05/rustc-1.81.0-armv7-unknown-freebsd.tar.xz) = 62941904
+SHA256 (rust/2024-09-05/rust-std-1.81.0-armv7-unknown-freebsd.tar.xz) = cadc589d89ca68fb81ad2913e60e89348a75bd228725f82faba2d4c961a2aca7
+SIZE (rust/2024-09-05/rust-std-1.81.0-armv7-unknown-freebsd.tar.xz) = 25949604
+SHA256 (rust/2024-09-05/cargo-1.81.0-armv7-unknown-freebsd.tar.xz) = efbd26868fef7fbca7da59591fdbacefa0f3ad5e263b9487d4fe07c93e0da588
+SIZE (rust/2024-09-05/cargo-1.81.0-armv7-unknown-freebsd.tar.xz) = 9313164
 SHA256 (rust/2024-09-05/rustc-1.81.0-i686-unknown-freebsd.tar.xz) = 5562e52a5d3bc7e6072838c0aa8e7e518fe2db74c0e3792204e1dc5306559b20
 SIZE (rust/2024-09-05/rustc-1.81.0-i686-unknown-freebsd.tar.xz) = 68846504
 SHA256 (rust/2024-09-05/rust-std-1.81.0-i686-unknown-freebsd.tar.xz) = 7f0422aa60f4df0fabc4a07708319b09f496833cc6c4111544710a683b0571b2
diff --git a/lang/rust/files/armv7/patch-compiler_rustc__target_src_spec_base_freebsd.rs b/lang/rust/files/armv7/patch-compiler_rustc__target_src_spec_base_freebsd.rs
new file mode 100644
index 000000000000..6bbfec294be6
--- /dev/null
+++ b/lang/rust/files/armv7/patch-compiler_rustc__target_src_spec_base_freebsd.rs
@@ -0,0 +1,11 @@
+--- compiler/rustc_target/src/spec/base/freebsd.rs.orig	2024-11-16 UTC
++++ compiler/rustc_target/src/spec/base/freebsd.rs
+@@ -9,7 +9,7 @@ pub fn opts() -> TargetOptions {
+         crt_static_respected: true,
+         position_independent_executables: true,
+         relro_level: RelroLevel::Full,
+-        has_thread_local: true,
++        has_thread_local: false,
+         abi_return_struct_as_int: true,
+         default_dwarf_version: 2,
+         ..Default::default()



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202411220842.4AM8gvAr068959>