From owner-svn-ports-all@freebsd.org Fri Sep 21 11:16:09 2018 Return-Path: Delivered-To: svn-ports-all@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 53B9D109674E; Fri, 21 Sep 2018 11:16:09 +0000 (UTC) (envelope-from jbeich@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 02E1D799CF; Fri, 21 Sep 2018 11:16:09 +0000 (UTC) (envelope-from jbeich@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id EF7D144C2; Fri, 21 Sep 2018 11:16:08 +0000 (UTC) (envelope-from jbeich@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id w8LBG8Se088145; Fri, 21 Sep 2018 11:16:08 GMT (envelope-from jbeich@FreeBSD.org) Received: (from jbeich@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id w8LBG898088144; Fri, 21 Sep 2018 11:16:08 GMT (envelope-from jbeich@FreeBSD.org) Message-Id: <201809211116.w8LBG898088144@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: jbeich set sender to jbeich@FreeBSD.org using -f From: Jan Beich Date: Fri, 21 Sep 2018 11:16:08 +0000 (UTC) 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 X-SVN-Group: ports-head X-SVN-Commit-Author: jbeich X-SVN-Commit-Paths: in head: Mk/Uses lang/rust X-SVN-Commit-Revision: 480253 X-SVN-Commit-Repository: ports MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.27 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 21 Sep 2018 11:16:09 -0000 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 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