Sat Sep 16 13:21:23 2023 UTC ()
meson/build.mk: apply qemu fix here too for benefit of other packages


(tnn)
diff -r1.18 -r1.19 pkgsrc/devel/meson/build.mk
cvs diff -r1.18 -r1.19 pkgsrc/devel/meson/build.mk (expand / switch to unified diff)

--- pkgsrc/devel/meson/build.mk 2023/06/27 10:41:25 1.18
+++ pkgsrc/devel/meson/build.mk 2023/09/16 13:21:23 1.19
@@ -1,32 +1,36 @@ @@ -1,32 +1,36 @@
1# $NetBSD: build.mk,v 1.18 2023/06/27 10:41:25 riastradh Exp $ 1# $NetBSD: build.mk,v 1.19 2023/09/16 13:21:23 tnn Exp $
2 2
3MESON_REQD?= 0 3MESON_REQD?= 0
4.for version in ${MESON_REQD} 4.for version in ${MESON_REQD}
5TOOL_DEPENDS+= meson>=${version}:../../devel/meson 5TOOL_DEPENDS+= meson>=${version}:../../devel/meson
6.endfor 6.endfor
7 7
8CONFIGURE_DIRS?= . 8CONFIGURE_DIRS?= .
9BUILD_DIRS?= ${CONFIGURE_DIRS} 9BUILD_DIRS?= ${CONFIGURE_DIRS}
10INSTALL_DIRS?= ${CONFIGURE_DIRS} 10INSTALL_DIRS?= ${CONFIGURE_DIRS}
11TEST_DIRS?= ${CONFIGURE_DIRS} 11TEST_DIRS?= ${CONFIGURE_DIRS}
12 12
13.PHONY: meson-configure meson-build meson-install meson-test 13.PHONY: meson-configure meson-build meson-install meson-test
14 14
15# pkgsrc contains multiple llvm-config executables at multiple locations. 15# pkgsrc contains multiple llvm-config executables at multiple locations.
16.if !empty(LLVM_CONFIG_PATH) 16.if !empty(LLVM_CONFIG_PATH)
17MAKE_ENV+= LLVM_CONFIG_PATH=${LLVM_CONFIG_PATH:Q} 17MAKE_ENV+= LLVM_CONFIG_PATH=${LLVM_CONFIG_PATH:Q}
18.endif 18.endif
19 19
 20# Prevent use of "response files" that break pkgsrc wrappers.
 21# The default threshold of 64k is too low for pkgsrc.
 22MAKE_ENV+= MESON_RSP_THRESHOLD=262144
 23
20.if !defined(USE_CMAKE) 24.if !defined(USE_CMAKE)
21MAKE_ENV+= CMAKE=${TOOLS_PATH.false} 25MAKE_ENV+= CMAKE=${TOOLS_PATH.false}
22.endif 26.endif
23 27
24.include "../../mk/bsd.prefs.mk" 28.include "../../mk/bsd.prefs.mk"
25 29
26.if ${USE_CROSS_COMPILE:U:tl} == yes 30.if ${USE_CROSS_COMPILE:U:tl} == yes
27MESON_CPU_FAMILY.amd64= x86_64 31MESON_CPU_FAMILY.amd64= x86_64
28MESON_CPU_FAMILY.arm26?= arm 32MESON_CPU_FAMILY.arm26?= arm
29MESON_CPU_FAMILY.arm32?= arm 33MESON_CPU_FAMILY.arm32?= arm
30MESON_CPU_FAMILY.earm?= arm 34MESON_CPU_FAMILY.earm?= arm
31MESON_CPU_FAMILY.earmeb?= arm 35MESON_CPU_FAMILY.earmeb?= arm
32MESON_CPU_FAMILY.earmhf?= arm 36MESON_CPU_FAMILY.earmhf?= arm