Skip to content

Commit

Permalink
change patches for 1.47.0
Browse files Browse the repository at this point in the history
  • Loading branch information
konimex committed Oct 17, 2020
1 parent 20a4166 commit c572d29
Show file tree
Hide file tree
Showing 3 changed files with 11 additions and 55 deletions.
18 changes: 7 additions & 11 deletions libressl-3.1.X.patch
Original file line number Diff line number Diff line change
@@ -1,17 +1,13 @@
diff --git a/vendor/openssl-sys/build/main.rs b/vendor/openssl-sys/build/main.rs
index 162e11a66..9f3544313 100644
index 49f26d2b7..27deb1f36 100644
--- a/vendor/openssl-sys/build/main.rs
+++ b/vendor/openssl-sys/build/main.rs
@@ -204,6 +204,12 @@ See rust-openssl README for more information:
(3, 0, 0) => ('3', '0', '0'),
(3, 0, 1) => ('3', '0', '1'),
(3, 0, _) => ('3', '0', 'x'),
+ (3, 1, 0) => ('3', '1', '0'),
+ (3, 1, 1) => ('3', '1', '0'),
+ (3, 1, _) => ('3', '1', 'x'),
+ (3, 2, 0) => ('3', '2', '0'),
+ (3, 2, 1) => ('3', '2', '0'),
@@ -221,6 +221,8 @@ See rust-openssl README for more information:
(3, 1, 0) => ('3', '1', '0'),
(3, 1, _) => ('3', '1', 'x'),
(3, 2, 0) => ('3', '2', '0'),
+ (3, 2, 1) => ('3', '2', '1'),
+ (3, 2, _) => ('3', '2', 'x'),
_ => version_error(),
};

8 changes: 4 additions & 4 deletions llvm-clang.patch
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
--- rustc-1.41.0-src/src/libunwind/lib.rs
+++ rustc-1.41.0-src/src/libunwind/lib.rs
--- rustc-1.47.0-src/library/unwind/src/lib.rs
+++ rustc-1.47.0-src/library/unwind/src/lib.rs
@@ -21,8 +21,7 @@
}

Expand All @@ -10,8 +10,8 @@
extern "C" {}

#[cfg(target_os = "redox")]
--- rustc-1.41.0-src/src/libunwind/build.rs
+++ rustc-1.41.0-src/src/libunwind/build.rs
--- rustc-1.47.0-src/library/unwind/build.rs
+++ rustc-1.47.0-src/library/unwind/build.rs
@@ -105,15 +105,6 @@
cfg.file(root.join("src").join(src));
}
Expand Down
40 changes: 0 additions & 40 deletions llvm10.patch

This file was deleted.

0 comments on commit c572d29

Please sign in to comment.