Tue Jun 8 10:10:02 2021 UTC ()
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.


(bouyer)
diff -r1.246 -r1.247 pkgsrc/mk/buildlink3/bsd.buildlink3.mk
cvs diff -r1.246 -r1.247 pkgsrc/mk/buildlink3/bsd.buildlink3.mk (expand / switch to unified diff)

--- pkgsrc/mk/buildlink3/bsd.buildlink3.mk 2020/07/01 09:13:13 1.246
+++ pkgsrc/mk/buildlink3/bsd.buildlink3.mk 2021/06/08 10:10:02 1.247
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1# $NetBSD: bsd.buildlink3.mk,v 1.246 2020/07/01 09:13:13 rillig Exp $ 1# $NetBSD: bsd.buildlink3.mk,v 1.247 2021/06/08 10:10:02 bouyer Exp $
2# 2#
3# Copyright (c) 2004 The NetBSD Foundation, Inc. 3# Copyright (c) 2004 The NetBSD Foundation, Inc.
4# All rights reserved. 4# All rights reserved.
5# 5#
6# This code is derived from software contributed to The NetBSD Foundation 6# This code is derived from software contributed to The NetBSD Foundation
7# by Johnny C. Lam. 7# by Johnny C. Lam.
8# 8#
9# Redistribution and use in source and binary forms, with or without 9# Redistribution and use in source and binary forms, with or without
10# modification, are permitted provided that the following conditions 10# modification, are permitted provided that the following conditions
11# are met: 11# are met:
12# 1. Redistributions of source code must retain the above copyright 12# 1. Redistributions of source code must retain the above copyright
13# notice, this list of conditions and the following disclaimer. 13# notice, this list of conditions and the following disclaimer.
14# 2. Redistributions in binary form must reproduce the above copyright 14# 2. Redistributions in binary form must reproduce the above copyright
@@ -630,27 +630,27 @@ _BLNK_TARGETS.${_pkg_}+= buildlink-${_pk @@ -630,27 +630,27 @@ _BLNK_TARGETS.${_pkg_}+= buildlink-${_pk
630buildlink-${_pkg_}: ${_BLNK_TARGETS.${_pkg_}} 630buildlink-${_pkg_}: ${_BLNK_TARGETS.${_pkg_}}
631 631
632.PHONY: buildlink-${_pkg_}-message 632.PHONY: buildlink-${_pkg_}-message
633buildlink-${_pkg_}-message: 633buildlink-${_pkg_}-message:
634 ${RUN} \ 634 ${RUN} \
635 ${ECHO_BUILDLINK_MSG} "=> Linking ${_pkg_} files into ${BUILDLINK_DIR}." 635 ${ECHO_BUILDLINK_MSG} "=> Linking ${_pkg_} files into ${BUILDLINK_DIR}."
636 636
637.PHONY: buildlink-${_pkg_}-cookie 637.PHONY: buildlink-${_pkg_}-cookie
638buildlink-${_pkg_}-cookie: 638buildlink-${_pkg_}-cookie:
639 ${RUN} \ 639 ${RUN} \
640 ${TOUCH} ${TOUCH_FLAGS} ${_BLNK_COOKIE.${_pkg_}} 640 ${TOUCH} ${TOUCH_FLAGS} ${_BLNK_COOKIE.${_pkg_}}
641 641
642BUILDLINK_CONTENTS_FILTER.${_pkg_}?= \ 642BUILDLINK_CONTENTS_FILTER.${_pkg_}?= \
643 ${EGREP} '(include.*/|\.h$$|\.idl$$|\.pc$$|/lib[^/]*\.[^/]*$$)' 643 ${EGREP} '(include.*/|\.h$$|\.idl$$|\.pc$$|/lib[^/]*\.[^/]*$$|lib/cmake/|share/cmake/)'
644# XXX: Why not pkg_info -qL? 644# XXX: Why not pkg_info -qL?
645BUILDLINK_FILES_CMD.${_pkg_}?= \ 645BUILDLINK_FILES_CMD.${_pkg_}?= \
646 ${_BLNK_PKG_INFO.${_pkg_}} -f ${BUILDLINK_PKGNAME.${_pkg_}} | \ 646 ${_BLNK_PKG_INFO.${_pkg_}} -f ${BUILDLINK_PKGNAME.${_pkg_}} | \
647 ${SED} -n '/File:/s/^[ ]*File:[ ]*//p' | \ 647 ${SED} -n '/File:/s/^[ ]*File:[ ]*//p' | \
648 ${BUILDLINK_CONTENTS_FILTER.${_pkg_}} | ${CAT} 648 ${BUILDLINK_CONTENTS_FILTER.${_pkg_}} | ${CAT}
649 649
650# _BLNK_FILES_CMD.<pkg> combines BUILDLINK_FILES_CMD.<pkg> and 650# _BLNK_FILES_CMD.<pkg> combines BUILDLINK_FILES_CMD.<pkg> and
651# BUILDLINK_FILES.<pkg> into one command that outputs all of the files 651# BUILDLINK_FILES.<pkg> into one command that outputs all of the files
652# for <pkg> relative to ${BUILDLINK_PREFIX.<pkg>}. 652# for <pkg> relative to ${BUILDLINK_PREFIX.<pkg>}.
653# 653#
654_BLNK_FILES_CMD.${_pkg_}= ( 654_BLNK_FILES_CMD.${_pkg_}= (
655_BLNK_FILES_CMD.${_pkg_}+= ${BUILDLINK_FILES_CMD.${_pkg_}}; 655_BLNK_FILES_CMD.${_pkg_}+= ${BUILDLINK_FILES_CMD.${_pkg_}};
656.for _filepattern_ in ${BUILDLINK_FILES.${_pkg_}} 656.for _filepattern_ in ${BUILDLINK_FILES.${_pkg_}}