Re: cmake handling in buildlink3

[Manuel Bouyer <bouyer%antioche.eu.org@localhost>]

On Thu, May 27, 2021 at 12:50:43AM +0200, Joerg Sonnenberger wrote:
> On Thu, May 27, 2021 at 12:35:09AM +0200, Manuel Bouyer wrote:
> > On Wed, May 26, 2021 at 10:50:38PM +0200, Joerg Sonnenberger wrote:
> > > On Wed, May 26, 2021 at 09:35:45PM +0200, Manuel Bouyer wrote:
> > > > Debugging this I noticed that bsd.buildlink3.mk didn't handle
> > > > cmake explicitely, and some cmake files were included by the default's
> > > > BUILDLINK_CONTENTS_FILTER by luck. I think we should explicitely include
> > > > *.cmake, as we do for *.pc. The attached patch does this and fixes my
> > > > problem.
> > > 
> > > I'd prefer to at least anchor them by path.
> > 
> > You mean, lib/cmake/*
> 
> Or share/cmake/*, yeah.

So attached is a new patch

-- 
Manuel Bouyer <bouyer%antioche.eu.org@localhost>
     NetBSD: 26 ans d'experience feront toujours la difference
--

Index: bsd.buildlink3.mk
===================================================================
RCS file: /cvsroot/pkgsrc/mk/buildlink3/bsd.buildlink3.mk,v
retrieving revision 1.246
diff -u -p -u -r1.246 bsd.buildlink3.mk
--- bsd.buildlink3.mk	1 Jul 2020 09:13:13 -0000	1.246
+++ bsd.buildlink3.mk	27 May 2021 11:24:46 -0000
@@ -640,7 +640,7 @@ buildlink-${_pkg_}-cookie:
 	${TOUCH} ${TOUCH_FLAGS} ${_BLNK_COOKIE.${_pkg_}}
 
 BUILDLINK_CONTENTS_FILTER.${_pkg_}?=					\
-	${EGREP} '(include.*/|\.h$$|\.idl$$|\.pc$$|/lib[^/]*\.[^/]*$$)'
+	${EGREP} '(include.*/|\.h$$|\.idl$$|\.pc$$|/lib[^/]*\.[^/]*$$|lib/cmake/|share/cmake/)'
 # XXX: Why not pkg_info -qL?
 BUILDLINK_FILES_CMD.${_pkg_}?=						\
 	${_BLNK_PKG_INFO.${_pkg_}} -f ${BUILDLINK_PKGNAME.${_pkg_}} |	\