From edaf48c1367a4e088239ca53b9a1072d582adfbb Mon Sep 17 00:00:00 2001 From: Niels Sascha Reedijk Date: Sun, 10 Jan 2021 11:02:53 +0000 Subject: [PATCH] Rust: add version 1.49.0 (#5572) --- dev-lang/rust/patches/rust-1.49.0.patchset | 114 ++++++++++++++ dev-lang/rust/rust-1.49.0.recipe | 168 +++++++++++++++++++++ dev-lang/rust_bin/rust_bin-1.49.0.recipe | 101 +++++++++++++ 3 files changed, 383 insertions(+) create mode 100644 dev-lang/rust/patches/rust-1.49.0.patchset create mode 100644 dev-lang/rust/rust-1.49.0.recipe create mode 100644 dev-lang/rust_bin/rust_bin-1.49.0.recipe diff --git a/dev-lang/rust/patches/rust-1.49.0.patchset b/dev-lang/rust/patches/rust-1.49.0.patchset new file mode 100644 index 000000000..06459ce3f --- /dev/null +++ b/dev-lang/rust/patches/rust-1.49.0.patchset @@ -0,0 +1,114 @@ +From 38c48f5f75d7390b6bd6992f8dd60277920f5e01 Mon Sep 17 00:00:00 2001 +From: Niels Sascha Reedijk +Date: Tue, 5 Jan 2021 13:20:04 +0000 +Subject: Haiku-specific patches for Rust 1.49.0 + + +diff --git a/Cargo.lock b/Cargo.lock +index c72c7b8..d7f8bc3 100644 +--- a/Cargo.lock ++++ b/Cargo.lock +@@ -4614,9 +4614,9 @@ checksum = "da73c8f77aebc0e40c300b93f0a5f1bece7a248a36eee287d4e095f35c7b7d6e" + + [[package]] + name = "socket2" +-version = "0.3.12" ++version = "0.3.11" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "03088793f677dce356f3ccc2edb1b314ad191ab702a5de3faf49304f7e104918" ++checksum = "e8b74de517221a2cb01a53349cf54182acdc31a074727d3079068448c0676d85" + dependencies = [ + "cfg-if 0.1.10", + "libc", +diff --git a/library/std/src/sys/unix/thread.rs b/library/std/src/sys/unix/thread.rs +index cda17eb..d9131e6 100644 +--- a/library/std/src/sys/unix/thread.rs ++++ b/library/std/src/sys/unix/thread.rs +@@ -176,7 +176,7 @@ impl Thread { + unsafe { + let ret = libc::pthread_join(self.id, ptr::null_mut()); + mem::forget(self); +- assert!(ret == 0, "failed to join thread: {}", io::Error::from_raw_os_error(ret)); ++ debug_assert_eq!(ret, 0); + } + } + +diff --git a/library/std/src/sys/windows/c.rs b/library/std/src/sys/windows/c.rs +index 657421e..2673661 100644 +--- a/library/std/src/sys/windows/c.rs ++++ b/library/std/src/sys/windows/c.rs +@@ -268,7 +268,6 @@ pub const FILE_END: DWORD = 2; + + pub const WAIT_OBJECT_0: DWORD = 0x00000000; + pub const WAIT_TIMEOUT: DWORD = 258; +-pub const WAIT_FAILED: DWORD = 0xFFFFFFFF; + + pub const PIPE_ACCESS_INBOUND: DWORD = 0x00000001; + pub const PIPE_ACCESS_OUTBOUND: DWORD = 0x00000002; +diff --git a/library/std/src/sys/windows/thread.rs b/library/std/src/sys/windows/thread.rs +index 38839ea..7bb8c95 100644 +--- a/library/std/src/sys/windows/thread.rs ++++ b/library/std/src/sys/windows/thread.rs +@@ -70,10 +70,7 @@ impl Thread { + } + + pub fn join(self) { +- let rc = unsafe { c::WaitForSingleObject(self.handle.raw(), c::INFINITE) }; +- if rc == c::WAIT_FAILED { +- panic!("failed to join on thread: {}", io::Error::last_os_error()); +- } ++ unsafe { c::WaitForSingleObject(self.handle.raw(), c::INFINITE); } + } + + pub fn yield_now() { +diff --git a/library/std/src/thread/mod.rs b/library/std/src/thread/mod.rs +index fefaa77..bbe5f60 100644 +--- a/library/std/src/thread/mod.rs ++++ b/library/std/src/thread/mod.rs +@@ -1351,11 +1351,6 @@ impl JoinHandle { + /// [`Err`]: crate::result::Result::Err + /// [atomic memory orderings]: crate::sync::atomic + /// +- /// # Panics +- /// +- /// This function may panic on some platforms if a thread attempts to join +- /// itself or otherwise may create a deadlock with joining threads. +- /// + /// # Examples + /// + /// ``` +diff --git a/src/llvm-project/llvm/lib/Support/CMakeLists.txt b/src/llvm-project/llvm/lib/Support/CMakeLists.txt +index 17bef02..e36da10 100644 +--- a/src/llvm-project/llvm/lib/Support/CMakeLists.txt ++++ b/src/llvm-project/llvm/lib/Support/CMakeLists.txt +@@ -36,6 +36,10 @@ elseif( CMAKE_HOST_UNIX ) + if( FUCHSIA ) + set(system_libs ${system_libs} zircon) + endif() ++ if ( HAIKU ) ++ add_definitions(-D_BSD_SOURCE) ++ set(system_libs ${system_libs} bsd) ++ endif() + endif( MSVC OR MINGW ) + + # Delay load shell32.dll if possible to speed up process startup. +diff --git a/src/llvm-project/llvm/lib/Support/Unix/Program.inc b/src/llvm-project/llvm/lib/Support/Unix/Program.inc +index 8f41fc0..950416d 100644 +--- a/src/llvm-project/llvm/lib/Support/Unix/Program.inc ++++ b/src/llvm-project/llvm/lib/Support/Unix/Program.inc +@@ -448,8 +448,12 @@ ProcessInfo llvm::sys::Wait(const ProcessInfo &PI, unsigned SecondsToWait, + if (ProcStat) { + std::chrono::microseconds UserT = toDuration(Info.ru_utime); + std::chrono::microseconds KernelT = toDuration(Info.ru_stime); ++#ifndef __HAIKU__ + uint64_t PeakMemory = static_cast(Info.ru_maxrss); + *ProcStat = ProcessStatistics{UserT + KernelT, UserT, PeakMemory}; ++#else ++ *ProcStat = ProcessStatistics{UserT + KernelT, UserT, 0}; ++#endif + } + + // Return the proper exit status. Detect error conditions +-- +2.26.0 + diff --git a/dev-lang/rust/rust-1.49.0.recipe b/dev-lang/rust/rust-1.49.0.recipe new file mode 100644 index 000000000..aa34b1524 --- /dev/null +++ b/dev-lang/rust/rust-1.49.0.recipe @@ -0,0 +1,168 @@ +SUMMARY="Modern and safe systems programming language" +DESCRIPTION="Rust is a systems programming language that runs blazingly fast, \ +prevents almost all crashes*, and eliminates data races." +HOMEPAGE="https://www.rust-lang.org/" +COPYRIGHT="2020 The Rust Project Developers" +LICENSE="MIT" +REVISION="1" +cargoVersion="0.50.0" +rustfmtVersion="1.4.25" +clippyVersion="0.0.212" +SOURCE_URI="https://static.rust-lang.org/dist/rustc-$portVersion-src.tar.xz" +CHECKSUM_SHA256="ebe910edc824a0a037a10be443446a0511923ba8342fa3c331ec8a22481d5d15" +SOURCE_DIR="rustc-$portVersion-src" +PATCHES="rust-$portVersion.patchset" + +ARCHITECTURES="!x86_gcc2 ?x86 ?x86_64" +SECONDARY_ARCHITECTURES="?x86" + +PROVIDES=" + rust_bin$secondaryArchSuffix = $portVersion + cmd:rustc$secondaryArchSuffix = $portVersion + cmd:rustdoc$secondaryArchSuffix = $portVersion + cmd:rustfmt$secondaryArchSuffix = $portVersion + cmd:rust_analyzer$secondaryArchSuffix = $portVersion + cmd:rust_gdb$secondaryArchSuffix = $portVersion + cmd:rust_gdbgui$secondaryArchSuffix = $portVersion + cmd:rust_lldb$secondaryArchSuffix = $portVersion + cmd:cargo$secondaryArchSuffix = $cargoVersion + cmd:cargo_clippy$secondaryArchSuffix = $clippyVersion + cmd:cargo_fmt$secondaryArchSuffix = $cargoVersion + cmd:cargo_miri$secondaryArchSuffix = $portVersion + cmd:clippy_driver$secondaryArchSuffix = $clippyVersion + cmd:miri$secondaryArchSuffix = $portVersion + cmd:rustfmt = $rustfmtVersion + " +REQUIRES=" + haiku$secondaryArchSuffix + lib:libcrypto$secondaryArchSuffix + lib:libcurl$secondaryArchSuffix + lib:libssl$secondaryArchSuffix + lib:libz$secondaryArchSuffix + " + +BUILD_REQUIRES=" + haiku${secondaryArchSuffix}_devel + devel:libcurl$secondaryArchSuffix + devel:libssl$secondaryArchSuffix + devel:libz$secondaryArchSuffix + " +BUILD_PREREQUIRES=" + cmd:cargo$secondaryArchSuffix == $cargoVersion + cmd:cmake + cmd:cmp + cmd:file + cmd:find + cmd:gcc$secondaryArchSuffix + cmd:git + cmd:grep + cmd:ld$secondaryArchSuffix + cmd:make + cmd:pkg_config$secondaryArchSuffix + cmd:python + cmd:rustc$secondaryArchSuffix == $portVersion + cmd:sed + cmd:tar + cmd:which + cmd:xargs + " + +relativeInstallDir="develop/tools$secondaryArchSubDir/rust" +installDir="$prefix/$relativeInstallDir" + +BUILD() +{ + # write the build configuration + tr -d '\t' >config.toml <<- EOL + [llvm] + targets = "X86" + experimental-targets = "" + + [build] + cargo = "/$relativeBinDir/cargo" + rustc = "/$relativeBinDir/rustc" + submodules = false + extended = true + tools = ["cargo", "clippy", "rustfmt", "analysis"] + + [install] + prefix = "$installDir" + libdir = "$installDir/bin/lib" + mandir = "$manDir" + docdir = "$developDocDir" + sysconfdir = "$dataDir" + + [rust] + channel = "stable" + rpath = false + deny-warnings = false + dist-src = false + + [dist] + src-tarball = false +EOL + # Disable ASLR: compiling stage 1 rustc requires a lot of RAM (about 1.5 + # GB). Haiku has a per-process limit of 2GB on 32 bit systems. ASLR makes + # the available space even smaller. Disabling it will give us the space to + # compile Rust + export DISABLE_ASLR=1 + + # now build rust and cargo + ./x.py dist +} + +INSTALL() +{ + # we will manually invoke the install scripts + if [ $effectiveTargetArchitecture = x86 ]; then + architecture="i686-unknown-haiku" + fi + if [ $effectiveTargetArchitecture = x86_64 ]; then + architecture="x86_64-unknown-haiku" + fi + + # let's install the packages one by one + cd $sourceDir/build/tmp/dist/ + for module in "rust-docs-$srcGitRev-$architecture" \ + "rust-std-$srcGitRev-$architecture" \ + "rustc-$srcGitRev-$architecture" \ + "rust-analysis-$srcGitRev-$architecture" \ + "cargo-$cargoVersion-$architecture" \ + "clippy-$clippyVersion-$architecture" \ + "rustfmt-$rustfmtVersion-$architecture" + do + ./$module/install.sh \ + --prefix=$installDir \ + --docdir=$developDocDir \ + --mandir=$manDir \ + --sysconfdir=$dataDir \ + --disable-ldconfig + done + + # move zsh data to the datadir + mv $installDir/share/zsh $dataDir + rm -rf $installDir/share + + # clean out unneccesary files created by the rust installer + rm $installDir/lib/rustlib/components + rm $installDir/lib/rustlib/install.log + rm $installDir/lib/rustlib/manifest-* + rm $installDir/lib/rustlib/rust-installer-version + rm $installDir/lib/rustlib/uninstall.sh + + # link the binaries in $binDir + mkdir -p $binDir + for f in cargo cargo-clippy cargo-fmt clippy-driver rls rust-gdb \ + rust-lldb rustc rustdoc rustfmt; do + symlinkRelative -sfn $installDir/bin/$f $binDir + done + + # make sure runtime_loader can find the libraries in the lib dir relative + # to the binaries + symlinkRelative -sfn $installDir/lib $installDir/bin/lib +} + +TEST() +{ + ./x.py test +} diff --git a/dev-lang/rust_bin/rust_bin-1.49.0.recipe b/dev-lang/rust_bin/rust_bin-1.49.0.recipe new file mode 100644 index 000000000..e2dbd1fe9 --- /dev/null +++ b/dev-lang/rust_bin/rust_bin-1.49.0.recipe @@ -0,0 +1,101 @@ +SUMMARY="Modern and safe systems programming language" +DESCRIPTION="Rust is a systems programming language that runs blazingly fast, \ +prevents almost all crashes*, and eliminates data races." +HOMEPAGE="https://www.rust-lang.org/" +COPYRIGHT="2020 The Rust Project Developers" +LICENSE="MIT" +REVISION="1" + +case "$effectiveTargetArchitecture" in + x86) +SOURCE_URI="http://dl.rust-on-haiku.com/dist/$portVersion/rust-$portVersion-i686-unknown-haiku.tar.xz" +CHECKSUM_SHA256="fa338a37691ef1027d702f51fbc88926b0593562036bec435fa9d92066c52278" +SOURCE_DIR="rust-$portVersion-i686-unknown-haiku" + ;; + x86_64) +SOURCE_URI="http://dl.rust-on-haiku.com/dist/$portVersion/rust-$portVersion-x86_64-unknown-haiku.tar.xz" +CHECKSUM_SHA256="3a41f55a42c3ab0f201f9eb048488ddfef9d9ca810b44ad27b757e19862370e8" +SOURCE_DIR="rust-$portVersion-x86_64-unknown-haiku" + ;; + *) +SOURCE_URI="http://dl.rust-on-haiku.com/dist/$portVersion/rustc-$portVersion-src.tar.xz" +CHECKSUM_SHA256="2cf1e5f3d31a74d93b08540dfb9cc2846e76a40a78918ddb4638e2c8a48e451c" +SOURCE_DIR="rustc-$portVersion-src" + ;; +esac + +ARCHITECTURES="!x86_gcc2 ?x86 x86_64" +SECONDARY_ARCHITECTURES="x86" +DISABLE_SOURCE_PACKAGE=yes + +cargoVersion="0.50.0" +rustfmtVersion="1.4.25" +clippyVersion="0.0.212" + +PROVIDES=" + rust_bin$secondaryArchSuffix = $portVersion + cmd:rustc$secondaryArchSuffix = $portVersion + cmd:rustdoc$secondaryArchSuffix = $portVersion + cmd:rustfmt$secondaryArchSuffix = $portVersion + cmd:rust_analyzer$secondaryArchSuffix = $portVersion + cmd:rust_gdb$secondaryArchSuffix = $portVersion + cmd:rust_gdbgui$secondaryArchSuffix = $portVersion + cmd:rust_lldb$secondaryArchSuffix = $portVersion + cmd:cargo$secondaryArchSuffix = $cargoVersion + cmd:cargo_clippy$secondaryArchSuffix = $clippyVersion + cmd:cargo_fmt$secondaryArchSuffix = $cargoVersion + cmd:cargo_miri$secondaryArchSuffix = $portVersion + cmd:clippy_driver$secondaryArchSuffix = $clippyVersion + cmd:miri$secondaryArchSuffix = $portVersion + cmd:rustfmt = $rustfmtVersion + " +REQUIRES=" + haiku$secondaryArchSuffix + lib:libcrypto$secondaryArchSuffix + lib:libcurl$secondaryArchSuffix + lib:libssl$secondaryArchSuffix + lib:libz$secondaryArchSuffix + " +CONFLICTS=" + rust$secondaryArchSuffix + " + +BUILD_REQUIRES=" + haiku${secondaryArchSuffix}_devel + " + +relativeInstallDir="develop/tools$secondaryArchSubDir/rust" +installDir="$prefix/$relativeInstallDir" + +INSTALL() +{ + ./install.sh \ + --prefix=$installDir \ + --docdir=$developDocDir \ + --mandir=$manDir \ + --sysconfdir=$dataDir \ + --disable-ldconfig + + # move zsh data to the datadir + mv $installDir/share/zsh $dataDir + rm -rf $installDir/share + + # clean out unneccesary files created by the rust installer + rm $installDir/lib/rustlib/components + rm $installDir/lib/rustlib/install.log + rm $installDir/lib/rustlib/manifest-* + rm $installDir/lib/rustlib/rust-installer-version + rm $installDir/lib/rustlib/uninstall.sh + + # link the binaries in $binDir + mkdir -p $binDir + for f in cargo cargo-clippy cargo-fmt cargo-miri clippy-driver miri \ + rust-analyzer rust-gdb rust-gdbgui rust-lldb rustc rustdoc \ + rustfmt; do + symlinkRelative -sfn $installDir/bin/$f $binDir + done + + # make sure runtime_loader can find the libraries in the lib dir relative + # to the binaries + symlinkRelative -sfn $installDir/lib $installDir/bin/lib +}