Skip to content

Commit b191b81

Browse files
committed
Build 1.63.0
1 parent 7da1524 commit b191b81

File tree

5 files changed

+104
-0
lines changed

5 files changed

+104
-0
lines changed

1.63.0/build.sh

Lines changed: 27 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,27 @@
1+
#!/bin/sh
2+
3+
RUSTC_BOOTSTRAP_VERSION=1.62.1
4+
CARGO_BOOTSTRAP_VERSION=1.62.1
5+
RUST_VERSION=1.63.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+
BASE=`pwd`
16+
DEST=$1
17+
LLVM_ROOT=""
18+
19+
. ../checksums.sh
20+
. ../common.sh
21+
22+
fixup-vendor() {
23+
fixup-vendor-patch openssl build.rs || exit 1
24+
fixup-vendor-patch openssl-sys build/cfgs.rs || exit 1
25+
}
26+
27+
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 2020-09-22 17:14:20 UTC
2+
+++ src/llvm-project/llvm/lib/Support/Unix/Path.inc
3+
@@ -69,13 +69,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+
@@ -106,7 +107,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__) || (__GNU__) || \
26+
defined(__MVS__)
27+
#define STATVFS_F_FLAG(vfs) (vfs).f_flag
28+
#else
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
@@ -45,6 +45,7 @@ SHA256_rustc_1_59_0_src_tar_gz=a7c8eeaee85bfcef84c96b02b3171d1e6540d15179ff83ddd
4545
SHA256_rustc_1_60_0_src_tar_gz=20ca826d1cf674daf8e22c4f8c4b9743af07973211c839b85839742314c838b7
4646
SHA256_rustc_1_61_0_src_tar_gz=ad0b4351675aa9abdf4c7e066613bd274c4391c5506db152983426376101daed
4747
SHA256_rustc_1_62_1_src_tar_gz=72acbe6ffcd94f598382a7430b0d85ee8f679e6d0b27f3f566ed1c16c978133f
48+
SHA256_rustc_1_63_0_src_tar_gz=1f9580295642ef5da7e475a8da2397d65153d3f2cb92849dbd08ed0effca99d0
4849

4950
SHA256_cargo_0_27_0_x86_64_unknown_dragonfly_tar_xz=a0b670f797d01ea156cf3ca9f0a7aa2a76bfa8b35dfa779510cfedc1d82eb19b
5051
SHA256_rustc_1_26_0_x86_64_unknown_dragonfly_tar_xz=d14e5d973bfb671535212460d7eca2552379150ffc207712e825f06febdd57c6
@@ -190,3 +191,7 @@ SHA256_cargo_1_61_0_x86_64_unknown_dragonfly_tar_xz=8a67a560d69603b0704a8112c9eb
190191
SHA256_rustc_1_61_0_x86_64_unknown_dragonfly_tar_xz=40dc6b7bdc82f661dd6321f4b50bd12390620fcb8f5458b4e1a1b22ac7972adf
191192
SHA256_rust_std_1_61_0_x86_64_unknown_dragonfly_tar_xz=359d1be2bd00bd8e788e7901efd0d9845afeb796a8be5f1aebe1fabe07ac3627
192193

194+
SHA256_cargo_1_62_1_x86_64_unknown_dragonfly_tar_xz=cf9e86da19cd9b7bd718f14cec1ccde7920334459bf292e25c8cf330a85b6cb8
195+
SHA256_rustc_1_62_1_x86_64_unknown_dragonfly_tar_xz=1fd4727a1f4bb913710e5b00f1afdcc9b57587073f1fd6c13f76bab8a0bdb7f6
196+
SHA256_rust_std_1_62_1_x86_64_unknown_dragonfly_tar_xz=5e5bf69bc9af174da63335e19716db6b589eed0348899541171dabbc47449afe
197+

0 commit comments

Comments
 (0)