diff options
Diffstat (limited to 'lang/rust/files')
3 files changed, 22 insertions, 24 deletions
diff --git a/lang/rust/files/patch-src_libstd_build.rs b/lang/rust/files/patch-src_libstd_build.rs new file mode 100644 index 000000000000..89f1bf7b0221 --- /dev/null +++ b/lang/rust/files/patch-src_libstd_build.rs @@ -0,0 +1,22 @@ +--- src/libstd/build.rs.orig 2018-09-03 18:29:12 UTC ++++ src/libstd/build.rs +@@ -94,13 +94,18 @@ fn build_libbacktrace(target: &str) -> Result<(), ()> + .out_dir(&native.out_dir) + .warnings(false) + .file("../libbacktrace/alloc.c") +- .file("../libbacktrace/backtrace.c") + .file("../libbacktrace/dwarf.c") + .file("../libbacktrace/fileline.c") + .file("../libbacktrace/posix.c") + .file("../libbacktrace/read.c") + .file("../libbacktrace/sort.c") + .file("../libbacktrace/state.c"); ++ ++ if target.contains("freebsd") { ++ build.file("../libbacktrace/nounwind.c"); ++ } else { ++ build.file("../libbacktrace/backtrace.c"); ++ } + + if target.contains("darwin") { + build.file("../libbacktrace/macho.c"); diff --git a/lang/rust/files/patch-src_vendor_libgit2-sys_libgit2_src_streams_openssl.c b/lang/rust/files/patch-src_vendor_libgit2-sys_libgit2_src_streams_openssl.c deleted file mode 100644 index 30b3c6bd6673..000000000000 --- a/lang/rust/files/patch-src_vendor_libgit2-sys_libgit2_src_streams_openssl.c +++ /dev/null @@ -1,12 +0,0 @@ ---- src/vendor/libgit2-sys/libgit2/src/streams/openssl.c.orig 2018-05-07 18:50:07 UTC -+++ src/vendor/libgit2-sys/libgit2/src/streams/openssl.c -@@ -104,7 +104,8 @@ int git_openssl_stream_global_init(void) - ssl_opts |= SSL_OP_NO_COMPRESSION; - #endif - --#if OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER) -+#if OPENSSL_VERSION_NUMBER < 0x10100000L || \ -+ (defined(LIBRESSL_VERSION_NUMBER) && LIBRESSL_VERSION_NUMBER < 0x20700000L) - SSL_load_error_strings(); - OpenSSL_add_ssl_algorithms(); - #else diff --git a/lang/rust/files/patch-src_vendor_libgit2-sys_libgit2_src_streams_openssl.h b/lang/rust/files/patch-src_vendor_libgit2-sys_libgit2_src_streams_openssl.h deleted file mode 100644 index 6e715ef874ab..000000000000 --- a/lang/rust/files/patch-src_vendor_libgit2-sys_libgit2_src_streams_openssl.h +++ /dev/null @@ -1,12 +0,0 @@ ---- src/vendor/libgit2-sys/libgit2/src/streams/openssl.h.orig 2018-05-07 18:50:07 UTC -+++ src/vendor/libgit2-sys/libgit2/src/streams/openssl.h -@@ -31,7 +31,8 @@ extern int git_openssl__set_cert_location(const char * - - - --# if OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER) -+# if OPENSSL_VERSION_NUMBER < 0x10100000L || \ -+ (defined(LIBRESSL_VERSION_NUMBER) && LIBRESSL_VERSION_NUMBER < 0x20700000L) - - GIT_INLINE(BIO_METHOD*) BIO_meth_new(int type, const char *name) - { |