pkgsrc-Changes archive

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

CVS commit: pkgsrc/devel/meson



Module Name:    pkgsrc
Committed By:   wiz
Date:           Sun May 19 05:37:11 UTC 2024

Modified Files:
        pkgsrc/devel/meson: build.mk

Log Message:
meson: do not hide cmake when it is in USE_TOOLS


To generate a diff of this commit:
cvs rdiff -u -r1.26 -r1.27 pkgsrc/devel/meson/build.mk

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/devel/meson/build.mk
diff -u pkgsrc/devel/meson/build.mk:1.26 pkgsrc/devel/meson/build.mk:1.27
--- pkgsrc/devel/meson/build.mk:1.26    Sat Feb  3 22:49:14 2024
+++ pkgsrc/devel/meson/build.mk Sun May 19 05:37:11 2024
@@ -1,4 +1,4 @@
-# $NetBSD: build.mk,v 1.26 2024/02/03 22:49:14 nros Exp $
+# $NetBSD: build.mk,v 1.27 2024/05/19 05:37:11 wiz Exp $
 
 MESON_REQD?=   0
 .for version in ${MESON_REQD}
@@ -21,7 +21,7 @@ MAKE_ENV+=    LLVM_CONFIG_PATH=${LLVM_CONFI
 # The default threshold of 64k is too low for pkgsrc.
 MAKE_ENV+=     MESON_RSP_THRESHOLD=262144
 
-.if !defined(USE_CMAKE)
+.if !defined(USE_CMAKE) && empty(USE_TOOLS:Mcmake)
 MAKE_ENV+=     CMAKE=${TOOLS_PATH.false}
 .endif
 



Home | Main Index | Thread Index | Old Index