D17258.diff
No OneTemporary
Actions

Size

1 KB

Referenced Files

None

Subscribers

None

D17258.diff
View Options

	Index: Mk/Uses/cargo.mk
	===================================================================
	--- Mk/Uses/cargo.mk
	+++ Mk/Uses/cargo.mk
	@@ -153,6 +153,12 @@
	LIB_DEPENDS+= libgit2.so:devel/libgit2
	.endif

	+.if ${CARGO_CRATES:Mlibssh2-sys-[0-9]*}
	+# Use the system's libssh2 instead of building the bundled version
	+CARGO_ENV+= LIBSSH2_SYS_USE_PKG_CONFIG=1
	+LIB_DEPENDS+= libssh2.so:security/libssh2
	+.endif
	+
	.if ${CARGO_CRATES:Monig_sys-[0-9]*}
	# onig_sys always prefers the system library but will try to link
	# statically with it. Since devel/oniguruma doesn't provide a static
	Index: lang/rust/Makefile
	===================================================================
	--- lang/rust/Makefile
	+++ lang/rust/Makefile
	@@ -3,7 +3,7 @@

	PORTNAME= rust
	PORTVERSION?= 1.29.0
	-PORTREVISION?=
	+PORTREVISION?= 1
	CATEGORIES= lang
	MASTER_SITES= http://static.rust-lang.org/dist/:src \
	LOCAL/dumbbell/rust:rust_bootstrap \
	@@ -30,7 +30,8 @@
	LICENSE_FILE_MIT= ${WRKSRC}/LICENSE-MIT

	BUILD_DEPENDS= cmake:devel/cmake
	-LIB_DEPENDS= libcurl.so:ftp/curl \
	+LIB_DEPENDS= libgit2.so:devel/libgit2 \
	+ libcurl.so:ftp/curl \
	libssh2.so:security/libssh2

	ONLY_FOR_ARCHS?= aarch64 amd64 i386
	@@ -97,6 +98,8 @@
	.include <bsd.port.pre.mk>

	X_PY_ENV= HOME="${WRKDIR}" \
	+ LIBGIT2_SYS_USE_PKG_CONFIG=1 \
	+ LIBSSH2_SYS_USE_PKG_CONFIG=1 \
	OPENSSL_DIR="${OPENSSLBASE}"
	X_PY_CMD= ${PYTHON_CMD} ${WRKSRC}/x.py