From df2d5291735f8e7e884492bd948775e76c5a12d3 Mon Sep 17 00:00:00 2001 From: Niels Sascha Reedijk Date: Sat, 20 Jul 2019 20:01:46 +0100 Subject: [PATCH] Rust: add recipe for 1.36.0 (#4017) This also removes the _x86 postfix from some earlier patchsets --- ...6-1.33.0.patchset => rust-1.33.0.patchset} | 0 ...6-1.34.2.patchset => rust-1.34.2.patchset} | 0 ...6-1.35.0.patchset => rust-1.35.0.patchset} | 0 dev-lang/rust/patches/rust-1.36.0.patchset | 145 +++++++++++++++ dev-lang/rust/rust-1.36.0.recipe | 167 ++++++++++++++++++ dev-lang/rust_bin/rust_bin-1.36.0.recipe | 98 ++++++++++ 6 files changed, 410 insertions(+) rename dev-lang/rust/patches/{rust_x86-1.33.0.patchset => rust-1.33.0.patchset} (100%) rename dev-lang/rust/patches/{rust_x86-1.34.2.patchset => rust-1.34.2.patchset} (100%) rename dev-lang/rust/patches/{rust_x86-1.35.0.patchset => rust-1.35.0.patchset} (100%) create mode 100644 dev-lang/rust/patches/rust-1.36.0.patchset create mode 100644 dev-lang/rust/rust-1.36.0.recipe create mode 100644 dev-lang/rust_bin/rust_bin-1.36.0.recipe diff --git a/dev-lang/rust/patches/rust_x86-1.33.0.patchset b/dev-lang/rust/patches/rust-1.33.0.patchset similarity index 100% rename from dev-lang/rust/patches/rust_x86-1.33.0.patchset rename to dev-lang/rust/patches/rust-1.33.0.patchset diff --git a/dev-lang/rust/patches/rust_x86-1.34.2.patchset b/dev-lang/rust/patches/rust-1.34.2.patchset similarity index 100% rename from dev-lang/rust/patches/rust_x86-1.34.2.patchset rename to dev-lang/rust/patches/rust-1.34.2.patchset diff --git a/dev-lang/rust/patches/rust_x86-1.35.0.patchset b/dev-lang/rust/patches/rust-1.35.0.patchset similarity index 100% rename from dev-lang/rust/patches/rust_x86-1.35.0.patchset rename to dev-lang/rust/patches/rust-1.35.0.patchset diff --git a/dev-lang/rust/patches/rust-1.36.0.patchset b/dev-lang/rust/patches/rust-1.36.0.patchset new file mode 100644 index 000000000..461ed86a3 --- /dev/null +++ b/dev-lang/rust/patches/rust-1.36.0.patchset @@ -0,0 +1,145 @@ +From 550112375756baa31f32414774f78d13ea271115 Mon Sep 17 00:00:00 2001 +From: Niels Sascha Reedijk +Date: Fri, 19 Jul 2019 04:03:55 +0200 +Subject: Rust: add recipe for 1.36.0 + + +diff --git a/Cargo.lock b/Cargo.lock +index b687637..0a2ede6 100644 +--- a/Cargo.lock ++++ b/Cargo.lock +@@ -1297,7 +1297,7 @@ dependencies = [ + "cc 1.0.35 (registry+https://github.com/rust-lang/crates.io-index)", + "curl-sys 0.4.18 (registry+https://github.com/rust-lang/crates.io-index)", + "libc 0.2.54 (registry+https://github.com/rust-lang/crates.io-index)", +- "libssh2-sys 0.2.11 (registry+https://github.com/rust-lang/crates.io-index)", ++ "libssh2-sys 0.2.11 (git+https://github.com/alexcrichton/ssh2-rs?rev=74d7f04)", + "libz-sys 1.0.25 (registry+https://github.com/rust-lang/crates.io-index)", + "openssl-sys 0.9.43 (registry+https://github.com/rust-lang/crates.io-index)", + "pkg-config 0.3.14 (registry+https://github.com/rust-lang/crates.io-index)", +@@ -1315,7 +1315,7 @@ dependencies = [ + [[package]] + name = "libssh2-sys" + version = "0.2.11" +-source = "registry+https://github.com/rust-lang/crates.io-index" ++source = "git+https://github.com/alexcrichton/ssh2-rs?rev=74d7f04#74d7f04dbee9997510bdad5608bb06970c6b4c8a" + dependencies = [ + "cc 1.0.35 (registry+https://github.com/rust-lang/crates.io-index)", + "libc 0.2.54 (registry+https://github.com/rust-lang/crates.io-index)", +@@ -4164,7 +4164,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" + "checksum libc 0.2.54 (registry+https://github.com/rust-lang/crates.io-index)" = "c6785aa7dd976f5fbf3b71cfd9cd49d7f783c1ff565a858d71031c6c313aa5c6" + "checksum libgit2-sys 0.7.11 (registry+https://github.com/rust-lang/crates.io-index)" = "48441cb35dc255da8ae72825689a95368bf510659ae1ad55dc4aa88cb1789bf1" + "checksum libnghttp2-sys 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)" = "d75d7966bda4730b722d1eab8e668df445368a24394bae9fc1e8dc0ab3dbe4f4" +-"checksum libssh2-sys 0.2.11 (registry+https://github.com/rust-lang/crates.io-index)" = "126a1f4078368b163bfdee65fbab072af08a1b374a5551b21e87ade27b1fbf9d" ++"checksum libssh2-sys 0.2.11 (git+https://github.com/alexcrichton/ssh2-rs?rev=74d7f04)" = "" + "checksum libz-sys 1.0.25 (registry+https://github.com/rust-lang/crates.io-index)" = "2eb5e43362e38e2bca2fd5f5134c4d4564a23a5c28e9b95411652021a8675ebe" + "checksum lock_api 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)" = "949826a5ccf18c1b3a7c3d57692778d21768b79e46eb9dd07bfc4c2160036c54" + "checksum log 0.4.6 (registry+https://github.com/rust-lang/crates.io-index)" = "c84ec4b527950aa83a329754b01dbe3f58361d1c5efacd1f6d68c494d08a17c6" +diff --git a/Cargo.toml b/Cargo.toml +index ccd7e8b..b23710f 100644 +--- a/Cargo.toml ++++ b/Cargo.toml +@@ -59,6 +59,7 @@ cargo = { path = "src/tools/cargo" } + # that we're shipping as well (to ensure that the rustfmt in RLS and the + # `rustfmt` executable are the same exact version). + rustfmt-nightly = { path = "src/tools/rustfmt" } ++libssh2-sys = { git = "https://github.com/alexcrichton/ssh2-rs", rev = "74d7f04" } + + # See comments in `src/tools/rustc-workspace-hack/README.md` for what's going on + # here +diff --git a/src/librustc_interface/util.rs b/src/librustc_interface/util.rs +index d2d0d19..55190ab 100644 +--- a/src/librustc_interface/util.rs ++++ b/src/librustc_interface/util.rs +@@ -120,9 +120,13 @@ pub fn create_session( + } + + // Temporarily have stack size set to 32MB to deal with various crates with long method +-// chains or deep syntax trees. ++// chains or deep syntax trees, except when on Haiku + // FIXME(oli-obk): get https://github.com/rust-lang/rust/pull/55617 the finish line +-const STACK_SIZE: usize = 32 * 1024 * 1024; // 32MB ++#[cfg(not(target_os = "haiku"))] ++const STACK_SIZE: usize = 32 * 1024 * 1024; ++ ++#[cfg(target_os = "haiku")] ++const STACK_SIZE: usize = 16 * 1024 * 1024; + + fn get_stack_size() -> Option { + // FIXME: Hacks on hacks. If the env is trying to override the stack size +diff --git a/src/libstd/sys/unix/thread.rs b/src/libstd/sys/unix/thread.rs +index f4a1783..9264bed 100644 +--- a/src/libstd/sys/unix/thread.rs ++++ b/src/libstd/sys/unix/thread.rs +@@ -164,8 +164,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/src/libstd/sys/windows/c.rs b/src/libstd/sys/windows/c.rs +index 518eccf..2aa5818 100644 +--- a/src/libstd/sys/windows/c.rs ++++ b/src/libstd/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; + + #[cfg(target_env = "msvc")] + #[cfg(feature = "backtrace")] +diff --git a/src/libstd/sys/windows/thread.rs b/src/libstd/sys/windows/thread.rs +index ebdf361..de198a6 100644 +--- a/src/libstd/sys/windows/thread.rs ++++ b/src/libstd/sys/windows/thread.rs +@@ -58,11 +58,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/src/libstd/thread/mod.rs b/src/libstd/thread/mod.rs +index 35de4f4..1d6d0c8 100644 +--- a/src/libstd/thread/mod.rs ++++ b/src/libstd/thread/mod.rs +@@ -1438,11 +1438,6 @@ impl JoinHandle { + /// [`panic`]: ../../std/macro.panic.html + /// [atomic memory orderings]: ../../std/sync/atomic/index.html + /// +- /// # 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/Unix/Signals.inc b/src/llvm-project/llvm/lib/Support/Unix/Signals.inc +index ad88d5e..9d320b7 100644 +--- a/src/llvm-project/llvm/lib/Support/Unix/Signals.inc ++++ b/src/llvm-project/llvm/lib/Support/Unix/Signals.inc +@@ -47,7 +47,9 @@ + #include "llvm/Support/raw_ostream.h" + #include + #include ++#define _BSD_SOURCE + #include ++#undef _BSD_SOURCE + #ifdef HAVE_BACKTRACE + # include BACKTRACE_HEADER // For backtrace(). + #endif +-- +2.19.0 + diff --git a/dev-lang/rust/rust-1.36.0.recipe b/dev-lang/rust/rust-1.36.0.recipe new file mode 100644 index 000000000..384eb6bc9 --- /dev/null +++ b/dev-lang/rust/rust-1.36.0.recipe @@ -0,0 +1,167 @@ +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="2018 The Rust Project Developers" +LICENSE="MIT" +REVISION="1" +cargoVersion="0.37.0" +rlsVersion="1.36.0" +rustfmtVersion="1.2.2" +clippyVersion="0.0.212" +SOURCE_URI="https://static.rust-lang.org/dist/rustc-$portVersion-src.tar.xz" +CHECKSUM_SHA256="f51645b9f787af4a5d94db17f6af39db0c55980ed24fe366cad55b57900f8f2d" +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_gdb$secondaryArchSuffix = $portVersion + cmd:rust_lldb$secondaryArchSuffix = $portVersion + cmd:cargo$secondaryArchSuffix = $cargoVersion + cmd:cargo_clippy$secondaryArchSuffix = $clippyVersion + cmd:cargo_fmt$secondaryArchSuffix = $cargoVersion + cmd:clippy_driver$secondaryArchSuffix = $clippyVersion + cmd:rls$secondaryArchSuffix = $rlsVersion + 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", "rls", "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" \ + "rls-$rlsVersion-$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.36.0.recipe b/dev-lang/rust_bin/rust_bin-1.36.0.recipe new file mode 100644 index 000000000..e0285ea3e --- /dev/null +++ b/dev-lang/rust_bin/rust_bin-1.36.0.recipe @@ -0,0 +1,98 @@ +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="2018 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="dde7b555a8f1783f38cbef4b545900099888ba1425286ba22202c4d5e8edf915" +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="fe55db32128248eb4c80c8fe976429d0ea2a64de76fc180274025ad86997b808" +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="18bd0e3c99f93a86542fa9a229cd69f44e5721115281952d1f85787dd21bb4d7" +SOURCE_DIR="rustc-$portVersion-src" + ;; +esac + +ARCHITECTURES="!x86_gcc2 ?x86 x86_64" +SECONDARY_ARCHITECTURES="x86" +DISABLE_SOURCE_PACKAGE=yes + +cargoVersion="0.37.0" +rlsVersion="1.36.0" +rustfmtVersion="1.2.2" +clippyVersion="0.0.212" + +PROVIDES=" + rust_bin$secondaryArchSuffix = $portVersion + cmd:rustc$secondaryArchSuffix = $portVersion + cmd:rustdoc$secondaryArchSuffix = $portVersion + cmd:rustfmt$secondaryArchSuffix = $portVersion + cmd:rust_gdb$secondaryArchSuffix = $portVersion + cmd:rust_lldb$secondaryArchSuffix = $portVersion + cmd:cargo$secondaryArchSuffix = $cargoVersion + cmd:cargo_clippy$secondaryArchSuffix = $clippyVersion + cmd:cargo_fmt$secondaryArchSuffix = $cargoVersion + cmd:clippy_driver$secondaryArchSuffix = $clippyVersion + cmd:rls$secondaryArchSuffix = $rlsVersion + 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 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 +}