Build 1.59.0

tuxillo · tuxillo · commit b6592a8df538 · 2022-07-15T18:30:31.000+02:00
diff --git a/1.59.0/build.sh b/1.59.0/build.sh
@@ -0,0 +1,28 @@
+#!/bin/sh
+
+RUSTC_BOOTSTRAP_VERSION=1.58.1
+CARGO_BOOTSTRAP_VERSION=1.58.1
+RUST_VERSION=1.59.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 build.rs || exit 1
+	fixup-vendor-patch openssl-sys build/cfgs.rs || exit 1
+	fixup-vendor-patch libc-0.2.108 src/unix/bsd/freebsdlike/dragonfly/mod.rs || exit 1
+}
+
+RUN info clean extract prepatch fixup-vendor config xbuild xdist inst 2>&1
diff --git a/1.59.0/patches/patch-src_llvm-project_llvm_lib_Support_Unix_Path.inc b/1.59.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
diff --git a/1.59.0/patches/patch-vendor_libc-0.2.108_src_unix_bsd_freebsdlike_dragonfly_mod.rs b/1.59.0/patches/patch-vendor_libc-0.2.108_src_unix_bsd_freebsdlike_dragonfly_mod.rs
@@ -0,0 +1,28 @@
+--- vendor/libc-0.2.108/src/unix/bsd/freebsdlike/dragonfly/mod.rs.orig	2022-02-23 05:34:25 UTC
++++ vendor/libc-0.2.108/src/unix/bsd/freebsdlike/dragonfly/mod.rs
+@@ -106,11 +106,6 @@ s! {
+         pub f_uid_uuid: ::uuid_t,
+     }
+ 
+-    #[deprecated(
+-        since = "0.2.107",
+-        note = "stat.st_blksize is an i64 and stat.st_qspare1 is replaced with \
+-                stat.st_blksize in DragonFly 5.8"
+-    )]
+     pub struct stat {
+         pub st_ino: ::ino_t,
+         pub st_nlink: ::nlink_t,
+@@ -128,11 +123,11 @@ s! {
+         pub st_ctime_nsec: ::c_long,
+         pub st_size: ::off_t,
+         pub st_blocks: i64,
+-        pub st_blksize: u32,
++        pub __old_st_blksize: u32,
+         pub st_flags: u32,
+         pub st_gen: u32,
+         pub st_lspare: i32,
+-        pub st_qspare1: i64,
++        pub st_blksize: i64,
+         pub st_qspare2: i64,
+     }
+ 
diff --git a/1.59.0/patches/patch-vendor_openssl-sys_build_cfgs.rs b/1.59.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();
+ 
diff --git a/1.59.0/patches/patch-vendor_openssl_build.rs b/1.59.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");
++        }
+     }
+ }
diff --git a/checksums.sh b/checksums.sh
@@ -41,6 +41,7 @@ SHA256_rustc_1_55_0_src_tar_gz=b2379ac710f5f876ee3c3e03122fe33098d6765d371cac6c3
 SHA256_rustc_1_56_0_src_tar_gz=cd0fd72d698deb3001c18e0f4bf8261d8f86420097eef94ca3a1fe047f2df43f
 SHA256_rustc_1_57_0_src_tar_gz=3546f9c3b91b1f8b8efd26c94d6b50312c08210397b4072ed2748e2bd4445c1a
 SHA256_rustc_1_58_1_src_tar_gz=a839afdd3625d6f3f3c4c10b79813675d1775c460d14be1feaf33a6c829c07c7
+SHA256_rustc_1_59_0_src_tar_gz=a7c8eeaee85bfcef84c96b02b3171d1e6540d15179ff83dddd9eafba185f85f9
 
 SHA256_cargo_0_27_0_x86_64_unknown_dragonfly_tar_xz=a0b670f797d01ea156cf3ca9f0a7aa2a76bfa8b35dfa779510cfedc1d82eb19b
 SHA256_rustc_1_26_0_x86_64_unknown_dragonfly_tar_xz=d14e5d973bfb671535212460d7eca2552379150ffc207712e825f06febdd57c6
@@ -170,3 +171,7 @@ SHA256_cargo_1_57_0_x86_64_unknown_dragonfly_tar_xz=50fbd3596ec090042ab521fbe327
 SHA256_rustc_1_57_0_x86_64_unknown_dragonfly_tar_xz=888f0afb4edf5976bf32513eeb5ad06fa1c0afe0af426a606fe012646bf48678
 SHA256_rust_std_1_57_0_x86_64_unknown_dragonfly_tar_xz=aa924b58005f0af816f9197021261082803a8507b3f4d4b96ef6add9ea442640
 
+SHA256_cargo_1_58_1_x86_64_unknown_dragonfly_tar_xz=1c20da26510705f446fe13a70e7e79d4c1deae3668dcf2d3a92d82e10c3a7407
+SHA256_rustc_1_58_1_x86_64_unknown_dragonfly_tar_xz=0e32635c70f6ff73541f106bed1eadb2f37bf670f2938797598683813f1ba382
+SHA256_rust_std_1_58_1_x86_64_unknown_dragonfly_tar_xz=0a09f01aa99fa7273941c36c428e07c9538a652b1ae5066a7cab7518e70d14b1
+
