tech-pkg archive

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

cmake handling in buildlink3

I ran into a case where cmake files from a package (www/libwebsockets)
were not all inclued by buildink, causing another package trying
to use it to fail at configure time (it did find
lib/cmake/libwebsockets/libwebsockets-config.cmake, but it includes
lib/cmake/libwebsockets/LibwebsocketsTargets.cmake which was not there)

Debugging this I noticed that 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

Is it OK to commit ?

Manuel Bouyer <>
     NetBSD: 26 ans d'experience feront toujours la difference
RCS file: /cvsroot/pkgsrc/mk/buildlink3/,v
retrieving revision 1.246
diff -u -p -u -r1.246
---	1 Jul 2020 09:13:13 -0000	1.246
+++	26 May 2021 19:30:26 -0000
@@ -640,7 +640,7 @@ buildlink-${_pkg_}-cookie:
 	${TOUCH} ${TOUCH_FLAGS} ${_BLNK_COOKIE.${_pkg_}}
-	${EGREP} '(include.*/|\.h$$|\.idl$$|\.pc$$|/lib[^/]*\.[^/]*$$)'
+	${EGREP} '(include.*/|\.h$$|\.idl$$|\.pc$$|\.cmake$$|/lib[^/]*\.[^/]*$$)'
 # XXX: Why not pkg_info -qL?
 BUILDLINK_FILES_CMD.${_pkg_}?=						\
 	${_BLNK_PKG_INFO.${_pkg_}} -f ${BUILDLINK_PKGNAME.${_pkg_}} |	\

Home | Main Index | Thread Index | Old Index