pkgsrc-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[pkgsrc/trunk]: pkgsrc/devel/meson meson: don't expose cmake if the package d...



details:   https://anonhg.NetBSD.org/pkgsrc/rev/b1dcbf7427bd
branches:  trunk
changeset: 342687:b1dcbf7427bd
user:      tnn <tnn%pkgsrc.org@localhost>
date:      Thu Oct 24 09:19:02 2019 +0000

description:
meson: don't expose cmake if the package didn't also set USE_CMAKE

diffstat:

 devel/meson/build.mk |  6 +++++-
 1 files changed, 5 insertions(+), 1 deletions(-)

diffs (20 lines):

diff -r ebc68d8b27a7 -r b1dcbf7427bd devel/meson/build.mk
--- a/devel/meson/build.mk      Thu Oct 24 08:30:20 2019 +0000
+++ b/devel/meson/build.mk      Thu Oct 24 09:19:02 2019 +0000
@@ -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 @@
 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}



Home | Main Index | Thread Index | Old Index