Build 1.50.0

Author: tuxillo

1.50.0/build.sh

@@ -0,0 +1,35 @@
+#!/bin/sh
+
+RUSTC_BOOTSTRAP_VERSION=1.49.0
+CARGO_BOOTSTRAP_VERSION=1.49.0
+RUST_VERSION=1.50.0
+
+CONFIGURE_CARGO_STATIC_FLAGS="--enable-cargo-native-static"
+
+# XXX: miri does not build correctly that's why we need the flag below.
+ADDITIONAL_CONFIGURE_FLAGS="--enable-missing-tools"
+
+# Since rust 1.38, OPENSSL_DIR has to be specified.
+export OPENSSL_DIR="/usr/local"
+
+BASE=`pwd`
+DEST=$1
+LLVM_ROOT=""
+
+. ../checksums.sh
+. ../common.sh
+
+fixup-vendor() {
+	fixup-vendor-patch openssl src/version.rs || exit 1
+	fixup-vendor-patch openssl src/ssl/mod.rs || exit 1
+	fixup-vendor-patch openssl build.rs || exit 1
+	fixup-vendor-patch openssl-sys build/main.rs || exit 1
+	fixup-vendor-patch openssl-sys build/cfgs.rs || exit 1
+	fixup-vendor-patch openssl-sys src/ssl.rs || exit 1
+	fixup-vendor-patch openssl-sys src/crypto.rs || exit 1
+	fixup-vendor-patch libc src/unix/bsd/freebsdlike/dragonfly/mod.rs || exit 1
+	fixup-vendor-patch libc src/lib.rs || exit 1
+	fixup-vendor-patch libc-0.2.79 src/unix/bsd/freebsdlike/dragonfly/errno.rs || exit 1
+}
+
+RUN info clean extract prepatch fixup-vendor config xbuild xdist inst 2>&1

1.50.0/patch-vendor_libc_src_unix_bsd_freebsdlike_dragonfly_errno.rs

@@ -0,0 +1,16 @@
+--- vendor/libc/src/unix/bsd/freebsdlike/dragonfly/errno.rs.orig	2021-02-10 18:18:38 UTC
++++ vendor/libc/src/unix/bsd/freebsdlike/dragonfly/errno.rs
+@@ -1,13 +1,2 @@
+ // DragonFlyBSD's __error function is declared with "static inline", so it must
+ // be implemented in the libc crate, as a pointer to a static thread_local.
+-f! {
+-    #[deprecated(since = "0.2.77", note = "Use `__errno_location()` instead")]
+-    pub fn __error() -> *mut ::c_int {
+-        &mut errno
+-    }
+-}
+-
+-extern "C" {
+-    #[thread_local]
+-    pub static mut errno: ::c_int;
+-}

1.50.0/patches/patch-library_std_src_sys_unix_os.rs

@@ -0,0 +1,10 @@
+--- library/std/src/sys/unix/os.rs.orig	2020-10-07 07:53:22 UTC
++++ library/std/src/sys/unix/os.rs
+@@ -87,6 +87,7 @@ pub fn errno() -> i32 {
+ }
+ 
+ #[cfg(target_os = "dragonfly")]
++#[allow(dead_code)] // but not all target cfgs actually end up using it
+ pub fn set_errno(e: i32) {
+     extern "C" {
+         #[thread_local]

1.50.0/patches/patch-src_llvm-project_llvm_lib_Support_Unix_Path.inc

@@ -0,0 +1,28 @@
+--- src/llvm-project/llvm/lib/Support/Unix/Path.inc.orig	2020-09-22 17:14:20 UTC
++++ src/llvm-project/llvm/lib/Support/Unix/Path.inc
+@@ -69,13 +69,14 @@ extern char **environ;
+ 
+ #include <sys/types.h>
+ #if !defined(__APPLE__) && !defined(__OpenBSD__) && !defined(__FreeBSD__) &&   \
+-    !defined(__linux__) && !defined(__FreeBSD_kernel__) && !defined(_AIX)
++    !defined(__linux__) && !defined(__FreeBSD_kernel__) && !defined(_AIX) &&   \
++    !defined(__DragonFly__)
+ #include <sys/statvfs.h>
+ #define STATVFS statvfs
+ #define FSTATVFS fstatvfs
+ #define STATVFS_F_FRSIZE(vfs) vfs.f_frsize
+ #else
+-#if defined(__OpenBSD__) || defined(__FreeBSD__)
++#if defined(__OpenBSD__) || defined(__FreeBSD__) || defined(__DragonFly__)
+ #include <sys/mount.h>
+ #include <sys/param.h>
+ #elif defined(__linux__)
+@@ -106,7 +107,7 @@ typedef uint_t uint;
+ #define STATVFS_F_FRSIZE(vfs) static_cast<uint64_t>(vfs.f_bsize)
+ #endif
+ 
+-#if defined(__NetBSD__) || defined(__DragonFly__) || defined(__GNU__) || \
++#if defined(__NetBSD__) || (__GNU__) || \
+     defined(__MVS__)
+ #define STATVFS_F_FLAG(vfs) (vfs).f_flag
+ #else

1.50.0/patches/patch-vendor_libc_0.2.79_src_unix_bsd_freebsdlike_dragonfly_errno.rs

@@ -0,0 +1,16 @@
+--- vendor/libc-0.2.79/src/unix/bsd/freebsdlike/dragonfly/errno.rs.orig	2021-02-10 18:18:38 UTC
++++ vendor/libc-0.2.79/src/unix/bsd/freebsdlike/dragonfly/errno.rs
+@@ -1,13 +1,2 @@
+ // DragonFlyBSD's __error function is declared with "static inline", so it must
+ // be implemented in the libc crate, as a pointer to a static thread_local.
+-f! {
+-    #[deprecated(since = "0.2.77", "Use `__errno_location()` instead")]
+-    pub fn __error() -> *mut ::c_int {
+-        &mut errno
+-    }
+-}
+-
+-extern "C" {
+-    #[thread_local]
+-    pub static mut errno: ::c_int;
+-}

1.50.0/patches/patch-vendor_openssl-sys_build_cfgs.rs

@@ -0,0 +1,24 @@
+--- vendor/openssl-sys/build/cfgs.rs.orig	2020-01-27 17:21:00 UTC
++++ vendor/openssl-sys/build/cfgs.rs
+@@ -28,6 +28,21 @@ pub fn get(openssl_version: Option<u64>,
+         if libressl_version >= 0x2_09_01_00_0 {
+             cfgs.push("libressl291");
+         }
++        if libressl_version >= 0x2_09_02_00_0 {
++            cfgs.push("libressl292");
++        }
++
++        if libressl_version >= 0x3_00_00_00_0 {
++            cfgs.push("libressl300");
++        }
++
++        if libressl_version >= 0x3_00_01_00_0 {
++            cfgs.push("libressl301");
++        }
++
++        if libressl_version >= 0x3_00_02_00_0 {
++            cfgs.push("libressl302");
++        }
+     } else {
+         let openssl_version = openssl_version.unwrap();
+ 

1.50.0/patches/patch-vendor_openssl_build.rs

@@ -0,0 +1,20 @@
+--- vendor/openssl/build.rs.orig	2020-01-27 17:21:00 UTC
++++ vendor/openssl/build.rs
+@@ -61,5 +61,17 @@ fn main() {
+         if version >= 0x2_09_01_00_0 {
+             println!("cargo:rustc-cfg=libressl291");
+         }
++
++        if version >= 0x3_00_00_00_0 {
++            println!("cargo:rustc-cfg=libressl300");
++        }
++
++        if version >= 0x3_00_01_00_0 {
++            println!("cargo:rustc-cfg=libressl301");
++        }
++
++        if version >= 0x3_00_02_00_0 {
++            println!("cargo:rustc-cfg=libressl302");
++        }
+     }
+ }