mirror of
https://github.com/yann64/haikuports.git
synced 2026-03-19 01:46:00 +01:00
Rust: update from-source recipe to 1.79, disable on x86_64
Build fails with:
```
error[E0463]: can't find crate for `core`
error[E0463]: can't find crate for `std`
For more information about this error, try `rustc --explain E0463`.
```
The relevant bit of the "explain":
```
Common causes for missing std or core
* You are cross-compiling for a target which doesn't have std prepackaged. Consider one of the
following:
+ Adding a pre-compiled version of std with rustup target add
+ Building std from source with cargo build -Z build-std
+ Using #![no_std] at the crate root, so you won't need std in the first place.
* You are developing the compiler itself and haven't built libstd from source. You can usually build it with x.py build library/std. More
information about x.py is available in the rustc-dev-guide.
```
Since I know nothing about Rust, my efforts stop here for today.
According to the git log, this seems to be the same state we were in the
1.73 recipe.
This commit is contained in:
@@ -1,24 +0,0 @@
|
||||
From 83028081fd5a3c49a3340432b59436cbc60e94ff Mon Sep 17 00:00:00 2001
|
||||
From: Niels Sascha Reedijk <niels.reedijk@gmail.com>
|
||||
Date: Sun, 12 Nov 2023 09:51:11 +0000
|
||||
Subject: [PATCH] Use html5ever with build fix for Haiku
|
||||
|
||||
---
|
||||
Cargo.toml | 1 +
|
||||
1 file changed, 1 insertion(+)
|
||||
|
||||
diff --git a/Cargo.toml b/Cargo.toml
|
||||
index d2e84d5..1713cd4 100644
|
||||
--- a/Cargo.toml
|
||||
+++ b/Cargo.toml
|
||||
@@ -109,6 +109,7 @@ object.debug = 0
|
||||
rustc-std-workspace-core = { path = 'library/rustc-std-workspace-core' }
|
||||
rustc-std-workspace-alloc = { path = 'library/rustc-std-workspace-alloc' }
|
||||
rustc-std-workspace-std = { path = 'library/rustc-std-workspace-std' }
|
||||
+html5ever = { git = 'https://github.com/servo/html5ever', rev = '16b5127f6cce2182409a8384a38af8dc64532d23' }
|
||||
|
||||
[patch."https://github.com/rust-lang/rust-clippy"]
|
||||
clippy_lints = { path = "src/tools/clippy/clippy_lints" }
|
||||
--
|
||||
2.37.3
|
||||
|
||||
19
dev-lang/rust/patches/rust-1.79.0.patchset
Normal file
19
dev-lang/rust/patches/rust-1.79.0.patchset
Normal file
@@ -0,0 +1,19 @@
|
||||
From 6763625972ef0118eb757a8653a61bdcecb599a9 Mon Sep 17 00:00:00 2001
|
||||
From: PulkoMandy <pulkomandy@pulkomandy.tk>
|
||||
Date: Sat, 10 Aug 2024 20:12:43 +0200
|
||||
Subject: Use html5ever version woth patch for Haiku
|
||||
|
||||
(ported from Rust 1.73 patchset)
|
||||
|
||||
diff --git a/Cargo.toml b/Cargo.toml
|
||||
index 1379e4c..05881f1 100644
|
||||
--- a/Cargo.toml
|
||||
+++ b/Cargo.toml
|
||||
@@ -112,3 +112,4 @@ strip = true
|
||||
rustc-std-workspace-core = { path = 'library/rustc-std-workspace-core' }
|
||||
rustc-std-workspace-alloc = { path = 'library/rustc-std-workspace-alloc' }
|
||||
rustc-std-workspace-std = { path = 'library/rustc-std-workspace-std' }
|
||||
+html5ever = { git = 'https://github.com/servo/html5ever', rev = '16b5127f6cce2182409a8384a38af8dc64532d23' }
|
||||
--
|
||||
2.45.2
|
||||
|
||||
@@ -5,17 +5,17 @@ HOMEPAGE="https://www.rust-lang.org/"
|
||||
COPYRIGHT="2023 The Rust Project Developers"
|
||||
LICENSE="MIT"
|
||||
REVISION="1"
|
||||
cargoVersion="0.74.0"
|
||||
rustfmtVersion="1.6.0"
|
||||
clippyVersion="0.1.73"
|
||||
cargoVersion="0.80.0"
|
||||
rustfmtVersion="1.79.0"
|
||||
clippyVersion="0.1.79"
|
||||
rlsVersion="2.0.0"
|
||||
SOURCE_URI="https://static.rust-lang.org/dist/rustc-$portVersion-src.tar.xz"
|
||||
CHECKSUM_SHA256="6eaf672dbea2e6596af8c999f5e6924b9af4bb8b02166bfe0b928e68aa75ae62"
|
||||
CHECKSUM_SHA256="ab826e84b8d48ec6eda3370065034dea8c006f6a946d78a9ba12bcb50e6d3c7a"
|
||||
SOURCE_DIR="rustc-$portVersion-src"
|
||||
PATCHES="rust-$portVersion.patchset"
|
||||
|
||||
|
||||
ARCHITECTURES="!x86_gcc2 ?x86 ?x86_64"
|
||||
ARCHITECTURES="!x86_gcc2 ?x86 !x86_64"
|
||||
SECONDARY_ARCHITECTURES="?x86"
|
||||
|
||||
PROVIDES="
|
||||
@@ -35,7 +35,7 @@ PROVIDES="
|
||||
"
|
||||
REQUIRES="
|
||||
haiku$secondaryArchSuffix
|
||||
lib:libcrypto$secondaryArchSuffix
|
||||
lib:libcrypto$secondaryArchSuffix >= 3
|
||||
lib:libssl$secondaryArchSuffix
|
||||
lib:libz$secondaryArchSuffix
|
||||
"
|
||||
Reference in New Issue
Block a user