| @@ -1,14 +1,14 @@ | | | @@ -1,14 +1,14 @@ |
1 | # $NetBSD: bsd.buildlink3.mk,v 1.242 2018/12/16 23:21:52 rillig Exp $ | | 1 | # $NetBSD: bsd.buildlink3.mk,v 1.243 2019/08/18 21:00:10 rillig 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 |
| @@ -194,26 +194,28 @@ MAKEFLAGS+= IGNORE_PKG.${_pkg_}=${IGNOR | | | @@ -194,26 +194,28 @@ MAKEFLAGS+= IGNORE_PKG.${_pkg_}=${IGNOR |
194 | # that shouldn't be skipped. | | 194 | # that shouldn't be skipped. |
195 | # | | 195 | # |
196 | # This does not use _BUILDLINK_TREE as the order matters. x11-links is | | 196 | # This does not use _BUILDLINK_TREE as the order matters. x11-links is |
197 | # sorted first to allow other packages to override the content. | | 197 | # sorted first to allow other packages to override the content. |
198 | # | | 198 | # |
199 | _BLNK_PACKAGES= # empty | | 199 | _BLNK_PACKAGES= # empty |
200 | .for _pkg_ in ${BUILDLINK_TREE:N-*:Mx11-links} ${BUILDLINK_TREE:N-*:Nx11-links} | | 200 | .for _pkg_ in ${BUILDLINK_TREE:N-*:Mx11-links} ${BUILDLINK_TREE:N-*:Nx11-links} |
201 | . if empty(_BLNK_PACKAGES:M${_pkg_}) && !defined(IGNORE_PKG.${_pkg_}) | | 201 | . if empty(_BLNK_PACKAGES:M${_pkg_}) && !defined(IGNORE_PKG.${_pkg_}) |
202 | _BLNK_PACKAGES+= ${_pkg_} | | 202 | _BLNK_PACKAGES+= ${_pkg_} |
203 | . endif | | 203 | . endif |
204 | .endfor | | 204 | .endfor |
205 | | | 205 | |
206 | _VARGROUPS+= bl3 | | 206 | _VARGROUPS+= bl3 |
| | | 207 | _DEF_VARS.bl3+= _BLNK_PACKAGES _BLNK_DEPENDS |
| | | 208 | _LISTED_VARS.bl3+= _BLNK_PACKAGES _BLNK_DEPENDS |
207 | .for v in BINDIR CFLAGS CPPFLAGS DEPENDS LDADD LDFLAGS LIBS | | 209 | .for v in BINDIR CFLAGS CPPFLAGS DEPENDS LDADD LDFLAGS LIBS |
208 | _SYS_VARS.bl3+= BUILDLINK_${v} | | 210 | _SYS_VARS.bl3+= BUILDLINK_${v} |
209 | .endfor | | 211 | .endfor |
210 | .for p in ${_BUILDLINK_TREE} | | 212 | .for p in ${_BUILDLINK_TREE} |
211 | . for v in AUTO_VARS BUILTIN_MK CONTENTS_FILTER CPPFLAGS DEPMETHOD FILES_CMD INCDIRS LDFLAGS LIBDIRS PKGNAME PREFIX RPATHDIRS | | 213 | . for v in AUTO_VARS BUILTIN_MK CONTENTS_FILTER CPPFLAGS DEPMETHOD FILES_CMD INCDIRS LDFLAGS LIBDIRS PKGNAME PREFIX RPATHDIRS |
212 | _SYS_VARS.bl3+= BUILDLINK_${v}.${p} | | 214 | _SYS_VARS.bl3+= BUILDLINK_${v}.${p} |
213 | . endfor | | 215 | . endfor |
214 | . for v in IGNORE_PKG USE_BUILTIN | | 216 | . for v in IGNORE_PKG USE_BUILTIN |
215 | _SYS_VARS.bl3+= ${v}.${p} | | 217 | _SYS_VARS.bl3+= ${v}.${p} |
216 | . endfor | | 218 | . endfor |
217 | .endfor | | 219 | .endfor |
218 | | | 220 | |
219 | # By default, every package receives a full dependency. | | 221 | # By default, every package receives a full dependency. |