Received: by mail.netbsd.org (Postfix, from userid 605) id 6B94484EFA; Sun, 11 Jul 2021 22:13:40 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by mail.netbsd.org (Postfix) with ESMTP id 9E4D484EE3 for ; Sun, 11 Jul 2021 22:13:39 +0000 (UTC) X-Virus-Scanned: amavisd-new at netbsd.org Received: from mail.netbsd.org ([127.0.0.1]) by localhost (mail.netbsd.org [127.0.0.1]) (amavisd-new, port 10025) with ESMTP id obSd0Y0Ty_5v for ; Sun, 11 Jul 2021 22:13:39 +0000 (UTC) Received: from cvs.NetBSD.org (ivanova.netbsd.org [199.233.217.197]) by mail.netbsd.org (Postfix) with ESMTP id 17CD384ED8 for ; Sun, 11 Jul 2021 22:13:39 +0000 (UTC) Received: by cvs.NetBSD.org (Postfix, from userid 500) id 0A4AAFA95; Sun, 11 Jul 2021 22:13:39 +0000 (UTC) Content-Transfer-Encoding: 7bit Content-Type: multipart/mixed; boundary="_----------=_1626041619272880" MIME-Version: 1.0 Date: Sun, 11 Jul 2021 22:13:39 +0000 From: "Havard Eidnes" Subject: CVS commit: pkgsrc/lang/rust To: pkgsrc-changes@NetBSD.org Reply-To: he@netbsd.org X-Mailer: log_accum Message-Id: <20210711221339.0A4AAFA95@cvs.NetBSD.org> Sender: pkgsrc-changes-owner@NetBSD.org List-Id: Precedence: bulk List-Unsubscribe: This is a multi-part message in MIME format. --_----------=_1626041619272880 Content-Disposition: inline Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset="US-ASCII" Module Name: pkgsrc Committed By: he Date: Sun Jul 11 22:13:38 UTC 2021 Modified Files: pkgsrc/lang/rust: Makefile options.mk Log Message: Evidently, cmake is needed in all cases. Move cmake dependency out of condition on PKG_OPTIONS.rust-llvm. To generate a diff of this commit: cvs rdiff -u -r1.241 -r1.242 pkgsrc/lang/rust/Makefile cvs rdiff -u -r1.14 -r1.15 pkgsrc/lang/rust/options.mk Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. --_----------=_1626041619272880 Content-Disposition: inline Content-Length: 1674 Content-Transfer-Encoding: binary Content-Type: text/x-diff; charset=us-ascii Modified files: Index: pkgsrc/lang/rust/Makefile diff -u pkgsrc/lang/rust/Makefile:1.241 pkgsrc/lang/rust/Makefile:1.242 --- pkgsrc/lang/rust/Makefile:1.241 Sun Jun 13 12:19:16 2021 +++ pkgsrc/lang/rust/Makefile Sun Jul 11 22:13:38 2021 @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.241 2021/06/13 12:19:16 he Exp $ +# $NetBSD: Makefile,v 1.242 2021/07/11 22:13:38 he Exp $ DISTNAME= rustc-1.52.1-src PKGNAME= ${DISTNAME:S/rustc/rust/:S/-src//} @@ -594,6 +594,8 @@ BUILD_DEPENDS+= compat80>=0:../../emulat DEPENDS+= libatomic-links>=0:../../devel/libatomic-links .endif +BUILD_DEPENDS+= cmake-[0-9]*:../../devel/cmake +.include "../../devel/cmake/buildlink3.mk" .include "../../devel/zlib/buildlink3.mk" .include "../../lang/python/tool.mk" .include "../../mk/bsd.pkg.mk" Index: pkgsrc/lang/rust/options.mk diff -u pkgsrc/lang/rust/options.mk:1.14 pkgsrc/lang/rust/options.mk:1.15 --- pkgsrc/lang/rust/options.mk:1.14 Sun Apr 4 08:51:20 2021 +++ pkgsrc/lang/rust/options.mk Sun Jul 11 22:13:38 2021 @@ -1,4 +1,4 @@ -# $NetBSD: options.mk,v 1.14 2021/04/04 08:51:20 he Exp $ +# $NetBSD: options.mk,v 1.15 2021/07/11 22:13:38 he Exp $ PKG_OPTIONS_VAR= PKG_OPTIONS.rust PKG_SUPPORTED_OPTIONS+= rust-cargo-static @@ -26,10 +26,7 @@ PKG_SUGGESTED_OPTIONS+= rust-cargo-stati # Use the internal copy of LLVM. # This contains some extra optimizations. # -.if !empty(PKG_OPTIONS:Mrust-llvm) -BUILD_DEPENDS+= cmake-[0-9]*:../../devel/cmake -.include "../../devel/cmake/buildlink3.mk" -.else +.if empty(PKG_OPTIONS:Mrust-llvm) .include "../../lang/llvm/buildlink3.mk" CONFIGURE_ARGS+= --enable-llvm-link-shared CONFIGURE_ARGS+= --llvm-root=${BUILDLINK_PREFIX.llvm} --_----------=_1626041619272880--