Received: by mail.netbsd.org (Postfix, from userid 605) id 8C11984D91; Thu, 24 Oct 2019 09:19:03 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by mail.netbsd.org (Postfix) with ESMTP id 16D5C84D7C for ; Thu, 24 Oct 2019 09:19:03 +0000 (UTC) X-Virus-Scanned: amavisd-new at netbsd.org Received: from mail.netbsd.org ([IPv6:::1]) by localhost (mail.netbsd.org [IPv6:::1]) (amavisd-new, port 10025) with ESMTP id hi39lqXGQNIj for ; Thu, 24 Oct 2019 09:19:02 +0000 (UTC) Received: from cvs.NetBSD.org (ivanova.NetBSD.org [IPv6:2001:470:a085:999:28c:faff:fe03:5984]) by mail.netbsd.org (Postfix) with ESMTP id 7661084D26 for ; Thu, 24 Oct 2019 09:19:02 +0000 (UTC) Received: by cvs.NetBSD.org (Postfix, from userid 500) id 708FCFA84; Thu, 24 Oct 2019 09:19:02 +0000 (UTC) Content-Transfer-Encoding: 7bit Content-Type: multipart/mixed; boundary="_----------=_157190874292460" MIME-Version: 1.0 Date: Thu, 24 Oct 2019 09:19:02 +0000 From: "Tobias Nygren" Subject: CVS commit: pkgsrc/devel/meson To: pkgsrc-changes@NetBSD.org Reply-To: tnn@netbsd.org X-Mailer: log_accum Message-Id: <20191024091902.708FCFA84@cvs.NetBSD.org> Sender: pkgsrc-changes-owner@NetBSD.org List-Id: pkgsrc-changes.NetBSD.org Precedence: bulk List-Unsubscribe: This is a multi-part message in MIME format. --_----------=_157190874292460 Content-Disposition: inline Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset="US-ASCII" Module Name: pkgsrc Committed By: tnn Date: Thu Oct 24 09:19:02 UTC 2019 Modified Files: pkgsrc/devel/meson: build.mk Log Message: meson: don't expose cmake if the package didn't also set USE_CMAKE To generate a diff of this commit: cvs rdiff -u -r1.2 -r1.3 pkgsrc/devel/meson/build.mk Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. --_----------=_157190874292460 Content-Disposition: inline Content-Length: 690 Content-Transfer-Encoding: binary Content-Type: text/x-diff; charset=us-ascii Modified files: Index: pkgsrc/devel/meson/build.mk diff -u pkgsrc/devel/meson/build.mk:1.2 pkgsrc/devel/meson/build.mk:1.3 --- pkgsrc/devel/meson/build.mk:1.2 Sat Oct 5 20:09:52 2019 +++ pkgsrc/devel/meson/build.mk Thu Oct 24 09:19:02 2019 @@ -1,4 +1,4 @@ -# $NetBSD: build.mk,v 1.2 2019/10/05 20:09:52 nia Exp $ +# $NetBSD: build.mk,v 1.3 2019/10/24 09:19:02 tnn Exp $ BUILD_DEPENDS+= meson-[0-9]*:../../devel/meson @@ -13,6 +13,10 @@ INSTALL_DIRS?= ${CONFIGURE_DIRS} MAKE_ENV+= LLVM_CONFIG_PATH=${LLVM_CONFIG_PATH:Q} .endif +.if !defined(USE_CMAKE) +MAKE_ENV+= CMAKE=${TOOLS_PATH.false} +.endif + do-configure: meson-configure meson-configure: .for d in ${CONFIGURE_DIRS} --_----------=_157190874292460--