Mon Nov 27 09:45:02 2023 UTC ()
vala: Limit buildlink3 includes to DEPMETHOD=full.

This file is generally only included when the valac and vapigen tools are
required, and it even defaults to DEPMETHOD=build.  The library dependencies
are not required for running the tools, and this avoids a number of implicit
dependency issues.


(jperkin)
diff -r1.39 -r1.40 pkgsrc/lang/vala/buildlink3.mk

cvs diff -r1.39 -r1.40 pkgsrc/lang/vala/buildlink3.mk (expand / switch to unified diff)

--- pkgsrc/lang/vala/buildlink3.mk 2023/11/12 13:22:33 1.39
+++ pkgsrc/lang/vala/buildlink3.mk 2023/11/27 09:45:02 1.40
@@ -1,24 +1,27 @@ @@ -1,24 +1,27 @@
1# $NetBSD: buildlink3.mk,v 1.39 2023/11/12 13:22:33 wiz Exp $ 1# $NetBSD: buildlink3.mk,v 1.40 2023/11/27 09:45:02 jperkin Exp $
2 2
3BUILDLINK_TREE+= vala 3BUILDLINK_TREE+= vala
4 4
5.if !defined(VALA_BUILDLINK3_MK) 5.if !defined(VALA_BUILDLINK3_MK)
6VALA_BUILDLINK3_MK:= 6VALA_BUILDLINK3_MK:=
7 7
8BUILDLINK_API_DEPENDS.vala+= vala>=0.56 8BUILDLINK_API_DEPENDS.vala+= vala>=0.56
9BUILDLINK_ABI_DEPENDS.vala+= vala>=0.56.13nb1 9BUILDLINK_ABI_DEPENDS.vala+= vala>=0.56.13nb1
10BUILDLINK_PKGSRCDIR.vala?= ../../lang/vala 10BUILDLINK_PKGSRCDIR.vala?= ../../lang/vala
11BUILDLINK_DEPMETHOD.vala?= build 11BUILDLINK_DEPMETHOD.vala?= build
12 12
13VALAC= ${PREFIX}/bin/valac-0.56 13VALAC= ${PREFIX}/bin/valac-0.56
14VAPIGEN= ${PREFIX}/bin/vapigen-0.56 14VAPIGEN= ${PREFIX}/bin/vapigen-0.56
15.if defined(GNU_CONFIGURE) 15.if defined(GNU_CONFIGURE)
16CONFIGURE_ENV+= VALAC=${VALAC} VAPIGEN=${VAPIGEN} 16CONFIGURE_ENV+= VALAC=${VALAC} VAPIGEN=${VAPIGEN}
17.endif 17.endif
18 18
 19.if ${BUILDLINK_DEPMETHOD.vala:U:Mfull}
19.include "../../devel/glib2/buildlink3.mk" 20.include "../../devel/glib2/buildlink3.mk"
20.include "../../devel/libltdl/buildlink3.mk" 21.include "../../devel/libltdl/buildlink3.mk"
21.include "../../graphics/graphviz/buildlink3.mk" 22.include "../../graphics/graphviz/buildlink3.mk"
 23.endif
 24
22.endif # VALA_BUILDLINK3_MK 25.endif # VALA_BUILDLINK3_MK
23 26
24BUILDLINK_TREE+= -vala 27BUILDLINK_TREE+= -vala