Attachment 186453 Details for Bug 222359 – possible-patch-lang_rust

[patch] possible-patch-lang_rust

svn-diff-lang_rust (text/plain), 2.58 KB, created by Walter Schwarzenfeld on 2017-09-17 10:43:57 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Walter Schwarzenfeld

Created: 2017-09-17 10:43:57 UTC

Size: 2.58 KB

patch

obsolete

>Index: Makefile
>===================================================================
>--- Makefile	(revision 449964)
>+++ Makefile	(working copy)
>@@ -3,7 +3,7 @@
> 
> PORTNAME=	rust
> PORTVERSION?=	1.19.0
>-PORTREVISION?=	2
>+PORTREVISION?=	3
> CATEGORIES=	lang
> MASTER_SITES=	http://static.rust-lang.org/dist/:src \
> 		https://static.rust-lang.org/dist/:rust_bootstrap \
>@@ -198,6 +198,12 @@
> 	if test "$$regex"; then \
> 		${REINPLACE_CMD} -E $$regex .cargo-checksum.json; \
> 	fi
>+
>+	@cd "${WRKSRC}/src/vendor/openssl-sys"; \
>+	old_checksum=$$(${SHA256} -q "build.rs.orig"); \
>+	new_checksum=$$(${SHA256} -q "build.rs"); \
>+	${REINPLACE_CMD}  's|\"build.rs\":\"'$${old_checksum}'\"|\"build.rs\":\"'$${new_checksum}'\"|' ${WRKSRC}/src/vendor/openssl-sys/.cargo-checksum.json
>+
> # We make a backup of a few files before the FreeBSD 10 autotools
> # fix is applied. We'll need them in `do-configure` to update the
> # `.cargo-checksum.json` files.
>@@ -351,5 +357,4 @@
> 		--verbose \
> 		--config ./config.toml \
> 		--jobs ${MAKE_JOBS_NUMBER}
>-
> .include <bsd.port.post.mk>
>Index: files/patch-vendor_openssl-sys_build_rs
>===================================================================
>--- files/patch-vendor_openssl-sys_build_rs	(nonexistent)
>+++ files/patch-vendor_openssl-sys_build_rs	(working copy)
>@@ -0,0 +1,24 @@
>+--- src/vendor/openssl-sys/build.rs.prig	2017-09-16 13:08:12 UTC
>++++ src/vendor/openssl-sys/build.rs
>+@@ -241,7 +241,7 @@ fn validate_headers(include_dirs: &[Path
>+ #include <openssl/opensslconf.h>
>+ 
>+ #if LIBRESSL_VERSION_NUMBER >= 0x20505000
>+-RUST_LIBRESSL_NEW
>++RUST_LIBRESSL_255
>+ #elif LIBRESSL_VERSION_NUMBER >= 0x20504000
>+ RUST_LIBRESSL_254
>+ #elif LIBRESSL_VERSION_NUMBER >= 0x20503000
>+@@ -347,6 +347,12 @@ See rust-openssl README for more informa
>+         println!("cargo:libressl=true");
>+         println!("cargo:version=101");
>+         Version::Libressl
>++    } else if expanded.contains("RUST_LIBRESSL_255") {
>++	println!("cargo:rustc-cfg=libressl");
>++        println!("cargo:rustc-cfg=libressl255");
>++        println!("cargo:libressl=true");
>++        println!("cargo:version=101");
>++        Version::Libressl
>+     } else if expanded.contains("RUST_OPENSSL_110") {
>+         println!("cargo:rustc-cfg=ossl110");
>+         println!("cargo:version=110");
>
>Property changes on: files/patch-vendor_openssl-sys_build_rs
>___________________________________________________________________
>Added: fbsd:nokeywords
>## -0,0 +1 ##
>+yes
>\ No newline at end of property
>Added: svn:eol-style
>## -0,0 +1 ##
>+native
>\ No newline at end of property
>Added: svn:mime-type
>## -0,0 +1 ##
>+text/plain
>\ No newline at end of property

Actions: View | Diff

Attachments on bug 222359: 186451 | 186453