Skip to content

Commit b751e02

Browse files
committed
Build 1.75.0
1 parent 9f7be92 commit b751e02

6 files changed

+123
-0
lines changed

1.75.0/build.sh

Lines changed: 33 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,33 @@
1+
#!/bin/sh
2+
3+
RUSTC_BOOTSTRAP_VERSION=1.74.0
4+
CARGO_BOOTSTRAP_VERSION=1.74.0
5+
RUST_VERSION=1.75.0
6+
7+
CONFIGURE_CARGO_STATIC_FLAGS="--enable-cargo-native-static"
8+
9+
# XXX: miri does not build correctly that's why we need the flag below.
10+
ADDITIONAL_CONFIGURE_FLAGS="--enable-missing-tools"
11+
12+
# Since rust 1.38, OPENSSL_DIR has to be specified.
13+
export OPENSSL_DIR="/usr/local"
14+
15+
# Show backtraces on failures
16+
export RUST_BACKTRACE=1
17+
18+
BASE=`pwd`
19+
DEST=$1
20+
LLVM_ROOT=""
21+
22+
. ../checksums.sh
23+
. ../common.sh
24+
25+
fixup-vendor() {
26+
fixup-vendor-patch openssl build.rs || exit 1
27+
fixup-vendor-patch openssl-sys build/cfgs.rs || exit 1
28+
fixup-vendor-patch libc src/unix/bsd/freebsdlike/dragonfly/mod.rs || exit 1
29+
fixup-vendor-patch rustix src/imp/libc/process/types.rs || exit 1
30+
fixup-vendor-patch rustix src/imp/libc/fs/dir.rs || exit 1
31+
}
32+
33+
RUN info clean extract prepatch fixup-vendor config xbuild xdist inst 2>&1
Lines changed: 28 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,28 @@
1+
--- src/llvm-project/llvm/lib/Support/Unix/Path.inc.orig 2023-05-31 19:29:26 UTC
2+
+++ src/llvm-project/llvm/lib/Support/Unix/Path.inc
3+
@@ -74,13 +74,14 @@ extern char **environ;
4+
5+
#include <sys/types.h>
6+
#if !defined(__APPLE__) && !defined(__OpenBSD__) && !defined(__FreeBSD__) && \
7+
- !defined(__linux__) && !defined(__FreeBSD_kernel__) && !defined(_AIX)
8+
+ !defined(__linux__) && !defined(__FreeBSD_kernel__) && !defined(_AIX) && \
9+
+ !defined(__DragonFly__)
10+
#include <sys/statvfs.h>
11+
#define STATVFS statvfs
12+
#define FSTATVFS fstatvfs
13+
#define STATVFS_F_FRSIZE(vfs) vfs.f_frsize
14+
#else
15+
-#if defined(__OpenBSD__) || defined(__FreeBSD__)
16+
+#if defined(__OpenBSD__) || defined(__FreeBSD__) || defined(__DragonFly__)
17+
#include <sys/mount.h>
18+
#include <sys/param.h>
19+
#elif defined(__linux__)
20+
@@ -111,7 +112,7 @@ typedef uint_t uint;
21+
#define STATVFS_F_FRSIZE(vfs) static_cast<uint64_t>(vfs.f_bsize)
22+
#endif
23+
24+
-#if defined(__NetBSD__) || defined(__DragonFly__) || defined(__GNU__) || \
25+
+#if defined(__NetBSD__) || defined(__GNU__) || \
26+
defined(__MVS__)
27+
#define STATVFS_F_FLAG(vfs) (vfs).f_flag
28+
#else
Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,13 @@
1+
--- vendor/libc/src/unix/bsd/freebsdlike/dragonfly/mod.rs.orig 2022-09-19 15:35:02 UTC
2+
+++ vendor/libc/src/unix/bsd/freebsdlike/dragonfly/mod.rs
3+
@@ -1488,6 +1488,10 @@ f! {
4+
_CMSG_ALIGN(length as usize)) as ::c_uint
5+
}
6+
7+
+ pub fn cpu_setsize(cpumask: &mut cpumask_t) -> ::c_int {
8+
+ (::mem::size_of::<cpumask_t>() * 8) as ::c_int
9+
+ }
10+
+
11+
pub fn CPU_ZERO(cpuset: &mut cpu_set_t) -> () {
12+
for slot in cpuset.ary.iter_mut() {
13+
*slot = 0;
Lines changed: 24 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,24 @@
1+
--- vendor/openssl-sys/build/cfgs.rs.orig 2020-01-27 17:21:00 UTC
2+
+++ vendor/openssl-sys/build/cfgs.rs
3+
@@ -28,6 +28,21 @@ pub fn get(openssl_version: Option<u64>,
4+
if libressl_version >= 0x2_09_01_00_0 {
5+
cfgs.push("libressl291");
6+
}
7+
+ if libressl_version >= 0x2_09_02_00_0 {
8+
+ cfgs.push("libressl292");
9+
+ }
10+
+
11+
+ if libressl_version >= 0x3_00_00_00_0 {
12+
+ cfgs.push("libressl300");
13+
+ }
14+
+
15+
+ if libressl_version >= 0x3_00_01_00_0 {
16+
+ cfgs.push("libressl301");
17+
+ }
18+
+
19+
+ if libressl_version >= 0x3_00_02_00_0 {
20+
+ cfgs.push("libressl302");
21+
+ }
22+
} else {
23+
let openssl_version = openssl_version.unwrap();
24+
Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,20 @@
1+
--- vendor/openssl/build.rs.orig 2020-01-27 17:21:00 UTC
2+
+++ vendor/openssl/build.rs
3+
@@ -61,5 +61,17 @@ fn main() {
4+
if version >= 0x2_09_01_00_0 {
5+
println!("cargo:rustc-cfg=libressl291");
6+
}
7+
+
8+
+ if version >= 0x3_00_00_00_0 {
9+
+ println!("cargo:rustc-cfg=libressl300");
10+
+ }
11+
+
12+
+ if version >= 0x3_00_01_00_0 {
13+
+ println!("cargo:rustc-cfg=libressl301");
14+
+ }
15+
+
16+
+ if version >= 0x3_00_02_00_0 {
17+
+ println!("cargo:rustc-cfg=libressl302");
18+
+ }
19+
}
20+
}

checksums.sh

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -57,6 +57,7 @@ SHA256_rustc_1_71_1_src_tar_gz=6fa90d50d1d529a75f6cc349784de57d7ec0ba2419b09bde7
5757
SHA256_rustc_1_72_1_src_tar_gz=7f48845f6a52cdbb5d63fb0528fd5f520eb443275b55f98e328159f86568f895
5858
SHA256_rustc_1_73_0_src_tar_gz=96d62e6d1f2d21df7ac8acb3b9882411f9e7c7036173f7f2ede9e1f1f6b1bb3a
5959
SHA256_rustc_1_74_0_src_tar_gz=882b584bc321c5dcfe77cdaa69f277906b936255ef7808fcd5c7492925cf1049
60+
SHA256_rustc_1_75_0_src_tar_gz=5b739f45bc9d341e2d1c570d65d2375591e22c2d23ef5b8a37711a0386abc088
6061

6162
SHA256_cargo_0_27_0_x86_64_unknown_dragonfly_tar_xz=a0b670f797d01ea156cf3ca9f0a7aa2a76bfa8b35dfa779510cfedc1d82eb19b
6263
SHA256_rustc_1_26_0_x86_64_unknown_dragonfly_tar_xz=d14e5d973bfb671535212460d7eca2552379150ffc207712e825f06febdd57c6
@@ -249,3 +250,7 @@ SHA256_rustc_1_72_1_x86_64_unknown_dragonfly_tar_xz=bd9cda78bc666861f3c030f768f7
249250
SHA256_cargo_1_73_0_x86_64_unknown_dragonfly_tar_xz=0f046a242c3c4413bbc5a87a8dff541fc9fc99148304507326bf108e3f8eb680
250251
SHA256_rustc_1_73_0_x86_64_unknown_dragonfly_tar_xz=4256bed59cea4713195268d49ab954fa85da89f426e0f5f96c7e6e012380834b
251252
SHA256_rust_std_1_73_0_x86_64_unknown_dragonfly_tar_xz=e415632e15dbd95c931d59bc269622efd49d49e134a7a992c0cc90b1da733c6b
253+
254+
SHA256_cargo_1_74_0_x86_64_unknown_dragonfly_tar_xz=95d783ede1a55b5b75fc62fe8d2347815ba392a601cd0bd701da0a36764566f9
255+
SHA256_rustc_1_74_0_x86_64_unknown_dragonfly_tar_xz=ba939d95f6d4cd546b0625787766c3314d606034185152595f679b171e088621
256+
SHA256_rust_std_1_74_0_x86_64_unknown_dragonfly_tar_xz=3a45797d2223ff441a66cb6d5beb5927b8d184f8947bf34e0f8ded4f9b31d760

0 commit comments

Comments
 (0)