From owner-svn-ports-all@freebsd.org Mon Dec 17 10:33:13 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 B91DE1339023; Mon, 17 Dec 2018 10:33:13 +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.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) server-signature RSA-PSS (4096 bits) client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 609738DFF0; Mon, 17 Dec 2018 10:33:13 +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 56FC2DBE0; Mon, 17 Dec 2018 10:33:13 +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 wBHAXDpQ064817; Mon, 17 Dec 2018 10:33:13 GMT (envelope-from jbeich@FreeBSD.org) Received: (from jbeich@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id wBHAXDGv064816; Mon, 17 Dec 2018 10:33:13 GMT (envelope-from jbeich@FreeBSD.org) Message-Id: <201812171033.wBHAXDGv064816@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: jbeich set sender to jbeich@FreeBSD.org using -f From: Jan Beich Date: Mon, 17 Dec 2018 10:33:13 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r487676 - head/lang/rust X-SVN-Group: ports-head X-SVN-Commit-Author: jbeich X-SVN-Commit-Paths: head/lang/rust X-SVN-Commit-Revision: 487676 X-SVN-Commit-Repository: ports MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Rspamd-Queue-Id: 609738DFF0 X-Spamd-Bar: -- Authentication-Results: mx1.freebsd.org X-Spamd-Result: default: False [-2.96 / 15.00]; local_wl_from(0.00)[FreeBSD.org]; NEURAL_HAM_MEDIUM(-1.00)[-0.997,0]; NEURAL_HAM_SHORT(-0.96)[-0.964,0]; ASN(0.00)[asn:11403, ipnet:2610:1c1:1::/48, country:US]; NEURAL_HAM_LONG(-1.00)[-0.996,0] X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.29 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: Mon, 17 Dec 2018 10:33:14 -0000 Author: jbeich Date: Mon Dec 17 10:33:12 2018 New Revision: 487676 URL: https://svnweb.freebsd.org/changeset/ports/487676 Log: lang/rust: drop unused conflicts after r446815 Modified: head/lang/rust/Makefile (contents, props changed) Modified: head/lang/rust/Makefile ============================================================================== --- head/lang/rust/Makefile Mon Dec 17 10:30:23 2018 (r487675) +++ head/lang/rust/Makefile Mon Dec 17 10:33:12 2018 (r487676) @@ -39,11 +39,6 @@ ONLY_FOR_ARCHS_REASON= requires prebuilt bootstrap com BROKEN_aarch64= fails to build: bootstrap compiler crashes -# FIXME: The bootstrapped rustc adds -L/usr/local/lib in front of -# the LDFLAGS. When stage0's rustc is linked, it picks the installed -# librust*so and fails. -#CONFLICTS_BUILD?= rust-nightly -#CONFLICTS_BUILD+= ${PKGBASE} CONFLICTS_INSTALL?= rust-nightly # See WRKSRC/src/stage0.txt for this date and version values. @@ -105,30 +100,6 @@ X_PY_CMD= ${PYTHON_CMD} ${WRKSRC}/x.py CRATES_PATCHED_BY_FBSD10_FIX?= src/vendor/libssh2-sys \ src/vendor/lzma-sys - -pre-fetch: - # FIXME: This is the same check for CONFLICTS as the standard - # one, except port origins are not compared. This allows - # the port to conflict with itself, because Rust would pick - # installed Rust libraries instead of freshly built ones. - @conflicts_with=$$( \ - { ${PKG_QUERY} -g "%n-%v %p %o" ${CONFLICTS:C/.+/'&'/} ${CONFLICTS_BUILD:C/.+/'&'/} 2>/dev/null || : ; } \ - | while read pkgname prfx orgn; do \ - if [ "/${PREFIX}" = "/$${prfx}" ]; then \ - ${ECHO_CMD} -n " $${pkgname}"; \ - fi; \ - done); \ - if [ -n "$${conflicts_with}" ]; then \ - ${ECHO_MSG}; \ - ${ECHO_MSG} "===> ${PKGNAME} conflicts with installed package(s): "; \ - for entry in $${conflicts_with}; do \ - ${ECHO_MSG} " $${entry}"; \ - done; \ - ${ECHO_MSG}; \ - ${ECHO_MSG} " They will not build together."; \ - ${ECHO_MSG} " Please remove them first with pkg delete."; \ - exit 1;\ - fi RUST_STD_DIR= ${RUST_STD_BOOTSTRAP:T:R:R}