Re: CVS commit: pkgsrc/lang/llvm

[Thomas Klausner <wiz%netbsd.org@localhost>]

On Fri, Jun 18, 2021 at 09:28:56PM +0100, Jonathan Perkin wrote:
> * On 2021-06-18 at 21:17 BST, Thomas Klausner wrote:
> > cmake expects targets (libraries, binaries) of a dependency to be in
> > the same location. So if we provide the libraries in ${BUILDLINK_DIR}
> > and the cmake support files also include the targets for binaries
> > (next to the ones for the libraries), these need to be in
> > ${BUILDLINK_DIR}, otherwise cmake won't accept the dependency as being
> > available.
> 
> Then we should revert whichever recent change to cmake caused this change in
> behaviour, not commit to forever hardcoding random paths in all our
> buildlink files.

The commit is attached.

I think it's a step in the right direction because we'll be able to
make cmake only find the stuff we want it to find. That we need to
link a few more files is not that bad IMO. Perhaps we can also talk to
upstream to export fewer of the targets, then we can reduce the links.

This only affects packages that provide cmake support files, btw, in
case that wasn't clear.
 Thomas

--- Begin Message ---

• To: pkgsrc-changes%NetBSD.org@localhost
• Subject: CVS commit: pkgsrc/mk/buildlink3
• From: "Manuel Bouyer" <bouyer%netbsd.org@localhost>
• Date: Tue, 8 Jun 2021 10:10:02 +0000

Module Name:	pkgsrc
Committed By:	bouyer
Date:		Tue Jun  8 10:10:02 UTC 2021

Modified Files:
	pkgsrc/mk/buildlink3: bsd.buildlink3.mk

Log Message:
Explicitely include lib/cmake/ and share/cmake/ in the
BUILDLINK_CONTENTS_FILTER, as discussed on tech-pkg on may 26 and 27.
Fix an issue with www/libwebsockets/buildink3.mk where some cmake files
are missing from the .buildlink dir, causing config failure in consumer
packages.


To generate a diff of this commit:
cvs rdiff -u -r1.246 -r1.247 pkgsrc/mk/buildlink3/bsd.buildlink3.mk

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/mk/buildlink3/bsd.buildlink3.mk
diff -u pkgsrc/mk/buildlink3/bsd.buildlink3.mk:1.246 pkgsrc/mk/buildlink3/bsd.buildlink3.mk:1.247
--- pkgsrc/mk/buildlink3/bsd.buildlink3.mk:1.246	Wed Jul  1 09:13:13 2020
+++ pkgsrc/mk/buildlink3/bsd.buildlink3.mk	Tue Jun  8 10:10:02 2021
@@ -1,4 +1,4 @@
-# $NetBSD: bsd.buildlink3.mk,v 1.246 2020/07/01 09:13:13 rillig Exp $
+# $NetBSD: bsd.buildlink3.mk,v 1.247 2021/06/08 10:10:02 bouyer Exp $
 #
 # Copyright (c) 2004 The NetBSD Foundation, Inc.
 # All rights reserved.
@@ -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_}} |	\

--- End Message ---