Skip to content

Commit 02980bd

Browse files
tuxillotuxillo
committed
Build 1.47.0
1 parent ad03fe8 commit 02980bd

8 files changed

+152
-1
lines changed

‎1.47.0/build.sh‎

Lines changed: 34 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,34 @@
1+
#!/bin/sh
2+
3+
RUSTC_BOOTSTRAP_VERSION=1.46.0
4+
CARGO_BOOTSTRAP_VERSION=0.47.0
5+
RUST_VERSION=1.47.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 src/version.rs || exit 1
24+
fixup-vendor-patch openssl src/ssl/mod.rs || exit 1
25+
fixup-vendor-patch openssl build.rs || exit 1
26+
fixup-vendor-patch openssl-sys build/main.rs || exit 1
27+
fixup-vendor-patch openssl-sys build/cfgs.rs || exit 1
28+
fixup-vendor-patch openssl-sys src/ssl.rs || exit 1
29+
fixup-vendor-patch openssl-sys src/crypto.rs || exit 1
30+
fixup-vendor-patch libc src/unix/bsd/freebsdlike/dragonfly/mod.rs || exit 1
31+
fixup-vendor-patch libc src/lib.rs || exit 1
32+
}
33+
34+
RUN info clean extract prepatch fixup-vendor config xbuild xdist inst 2>&1

‎1.47.0/patches/patch-library_std_src_sys_unix_os.rs‎

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,10 @@
1+
--- library/std/src/sys/unix/os.rs.orig 2020-10-07 07:53:22 UTC
2+
+++ library/std/src/sys/unix/os.rs
3+
@@ -87,6 +87,7 @@ pub fn errno() -> i32 {
4+
}
5+
6+
#[cfg(target_os = "dragonfly")]
7+
+#[allow(dead_code)] // but not all target cfgs actually end up using it
8+
pub fn set_errno(e: i32) {
9+
extern "C" {
10+
#[thread_local]

‎1.47.0/patches/patch-src_llvm-project_llvm_lib_Support_Unix_Path.inc‎

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

‎1.47.0/patches/patch-vendor_libc_src_lib.rs‎

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
1+
--- vendor/libc/src/lib.rs.orig 2019-11-04 17:34:41 UTC
2+
+++ vendor/libc/src/lib.rs
3+
@@ -21,7 +21,7 @@
4+
feature = "rustc-dep-of-std",
5+
feature(cfg_target_vendor, link_cfg, no_core)
6+
)]
7+
-#![cfg_attr(libc_thread_local, feature(thread_local))]
8+
+#![feature(thread_local)]
9+
// Enable extra lints:
10+
#![cfg_attr(feature = "extra_traits", deny(missing_debug_implementations))]
11+
#![deny(missing_copy_implementations, safe_packed_borrows)]

‎1.47.0/patches/patch-vendor_libc_src_unix_bsd_freebsdlike_dragonfly_mod.rs‎

Lines changed: 21 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,21 @@
1+
--- vendor/libc/src/unix/bsd/freebsdlike/dragonfly/mod.rs.orig 2019-12-16 17:26:11 UTC
2+
+++ vendor/libc/src/unix/bsd/freebsdlike/dragonfly/mod.rs
3+
@@ -1053,7 +1053,18 @@ f! {
4+
}
5+
}
6+
7+
+// DragonFlyBSD's __error function is declared with "static inline", so it must
8+
+// be implemented in the libc crate, as a pointer to a static thread_local.
9+
+f! {
10+
+ pub fn __error() -> *mut ::c_int {
11+
+ &mut errno
12+
+ }
13+
+}
14+
+
15+
extern "C" {
16+
+ #[thread_local]
17+
+ pub static mut errno: ::c_int;
18+
+
19+
pub fn setgrent();
20+
pub fn mprotect(
21+
addr: *mut ::c_void,

‎1.47.0/patches/patch-vendor_openssl-sys_build_cfgs.rs‎

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+

‎1.47.0/patches/patch-vendor_openssl_build.rs‎

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: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ SHA256_rustc_1_43_1_src_tar_gz=cde177b4a8c687da96f20de27630a1eb55c9d146a15e4c900
2929
SHA256_rustc_1_44_0_src_tar_gz=bf2df62317e533e84167c5bc7d4351a99fdab1f9cd6e6ba09f51996ad8561100
3030
SHA256_rustc_1_44_1_src_tar_gz=7e2e64cb298dd5d5aea52eafe943ba0458fa82f2987fdcda1ff6f537b6f88473
3131
SHA256_rustc_1_45_2_src_tar_gz=b7a3fc1e3ee367260ef945da867da0957f8983705f011ba2a73715375e50e308
32-
SHA256_rustc_1_46_0_src_tar_gz=2d6a3b7196db474ba3f37b8f5d50a1ecedff00738d7846840605b42bfc922728
32+
SHA256_rustc_1_47_0_src_tar_gz=3185df064c4747f2c8b9bb8c4468edd58ff4ad6d07880c879ac1b173b768d81d
3333

3434
SHA256_cargo_0_27_0_x86_64_unknown_dragonfly_tar_xz=a0b670f797d01ea156cf3ca9f0a7aa2a76bfa8b35dfa779510cfedc1d82eb19b
3535
SHA256_rustc_1_26_0_x86_64_unknown_dragonfly_tar_xz=d14e5d973bfb671535212460d7eca2552379150ffc207712e825f06febdd57c6
@@ -111,3 +111,6 @@ SHA256_cargo_0_46_1_x86_64_unknown_dragonfly_tar_xz=7e0ed9d139cf6cbbd2b3c64f2d69
111111
SHA256_rustc_1_45_2_x86_64_unknown_dragonfly_tar_xz=5e7ee607bb0c72f5f91e9868d7557bd77653fc0d01a999ce03e07150ebc43ab2
112112
SHA256_rust_std_1_45_2_x86_64_unknown_dragonfly_tar_xz=45dcc47a38c89a72dd95d5dc5541a65333abbc78b36b599c83262e390d0c61c4
113113

114+
SHA256_cargo_0_47_0_x86_64_unknown_dragonfly_tar_xz=d7835f91fb5148fda3229ffa8335abbaf74bbf5acbadc2c5b97f5a670a50380b
115+
SHA256_rustc_1_46_0_x86_64_unknown_dragonfly_tar_xz=8695d5048d5f299b9ad8488f31a0caa40573686d2535df72ede0eef831851a03
116+
SHA256_rust_std_1_46_0_x86_64_unknown_dragonfly_tar_xz=65c3cd62c06f58a52ea17410f30ecf0c7a8a6cba82e007c87d182f3c7810f83f

0 commit comments

Comments
 (0)