Date: Fri, 21 Sep 2018 11:16:08 +0000 (UTC) From: Jan Beich <jbeich@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r480253 - in head: Mk/Uses lang/rust Message-ID: <201809211116.w8LBG898088144@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: jbeich Date: Fri Sep 21 11:16:08 2018 New Revision: 480253 URL: https://svnweb.freebsd.org/changeset/ports/480253 Log: lang/rust: unbundle libgit2/libssh2 - libgit2 in ports is nowadays newer than bundled version - libssh2 was already unbundled until 1.29.0 update - Unbundle libssh2 for USES=cargo (unused atm) PR: 231411 Approved by: rust (dumbbell, tobik) Modified: head/Mk/Uses/cargo.mk (contents, props changed) head/lang/rust/Makefile (contents, props changed) Modified: head/Mk/Uses/cargo.mk ============================================================================== --- head/Mk/Uses/cargo.mk Fri Sep 21 11:13:15 2018 (r480252) +++ head/Mk/Uses/cargo.mk Fri Sep 21 11:16:08 2018 (r480253) @@ -153,6 +153,12 @@ CARGO_ENV+= LIBGIT2_SYS_USE_PKG_CONFIG=1 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 Modified: head/lang/rust/Makefile ============================================================================== --- head/lang/rust/Makefile Fri Sep 21 11:13:15 2018 (r480252) +++ head/lang/rust/Makefile Fri Sep 21 11:16:08 2018 (r480253) @@ -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_COMB= dual 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 @@ PLIST_FILES= lib/rustlib/components \ .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
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201809211116.w8LBG898088144>