From 56e4dbe835cebde51107df6f1232494cd8c1b05e Mon Sep 17 00:00:00 2001 From: Roland Illig Date: Mon, 19 Aug 2024 21:20:54 +0200 Subject: [PATCH] Mark USE_CMAKE as deprecated https://mail-index.netbsd.org/tech-pkg/2024/08/19/msg029812.html --- v23/pkgsrc.go | 3 +++ v23/tools_test.go | 11 ++++++++--- 2 files changed, 11 insertions(+), 3 deletions(-) diff --git a/v23/pkgsrc.go b/v23/pkgsrc.go index fc2c4754..c303b5ed 100644 --- a/v23/pkgsrc.go +++ b/v23/pkgsrc.go @@ -500,6 +500,9 @@ func (src *Pkgsrc) initDeprecatedVars() { // June 2016 "USE_CROSSBASE": "Has been removed.", + + // August 2024 + "USE_CMAKE": "Include \"../../devel/cmake/build.mk\" instead.", } } diff --git a/v23/tools_test.go b/v23/tools_test.go index 8a782125..95342a4d 100644 --- a/v23/tools_test.go +++ b/v23/tools_test.go @@ -455,9 +455,11 @@ func (s *Suite) Test_Tools__aliases_in_for_loop(c *check.C) { } // The cmake tool is included conditionally. The condition is so simple that -// pkglint could parse it but it depends on the particular package. +// pkglint could parse it, but the condition depends on the particular +// package. +// // This is something that pkglint cannot do right now, since the global tools -// are loaded once for all packages. +// are loaded once for all packages, before inspecting the single package. // // Therefore, there is a workaround for USE_CMAKE. // @@ -478,7 +480,10 @@ func (s *Suite) Test_Tools__cmake(c *check.C) { G.Check(t.File("category/package")) - t.CheckOutputEmpty() + t.CheckOutputLines( + "WARN: ~/category/package/Makefile:20: " + + "Definition of USE_CMAKE is deprecated. " + + "Include \"../../devel/cmake/build.mk\" instead.") } func (s *Suite) Test_Tools__gmake(c *check.C) {