diff options
| author | bouyer <bouyer@pkgsrc.org> | 2021-06-08 10:10:02 +0000 |
|---|---|---|
| committer | bouyer <bouyer@pkgsrc.org> | 2021-06-08 10:10:02 +0000 |
| commit | aa15ffb482e420c9a32b07092b74a4084807b2cb (patch) | |
| tree | bdc883c650ddc3898938d557b217737aa13dc6ad /mk | |
| parent | 33896490fa3bb5f561f69c74248a02974f62fe26 (diff) | |
| download | pkgsrc-aa15ffb482e420c9a32b07092b74a4084807b2cb.tar.gz | |
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.
Diffstat (limited to 'mk')
| -rw-r--r-- | mk/buildlink3/bsd.buildlink3.mk | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/mk/buildlink3/bsd.buildlink3.mk b/mk/buildlink3/bsd.buildlink3.mk index 6ab6df71aae..2c8fce3c6b8 100644 --- a/mk/buildlink3/bsd.buildlink3.mk +++ b/mk/buildlink3/bsd.buildlink3.mk @@ -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_}} | \ |