Date: Thu, 27 Jul 2023 04:11:50 GMT From: Jessica Clarke <jrtc27@FreeBSD.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org Subject: git: 5d6cb793d0d5 - main - bsd.compat.mk Extract _ALL_LIBCOMPATS and add related variables Message-ID: <202307270411.36R4Boo3097453@gitrepo.freebsd.org>
next in thread | raw e-mail | index | archive | help
The branch main has been updated by jrtc27: URL: https://cgit.FreeBSD.org/src/commit/?id=5d6cb793d0d56b3829168029b6940288f8fb61e6 commit 5d6cb793d0d56b3829168029b6940288f8fb61e6 Author: Jessica Clarke <jrtc27@FreeBSD.org> AuthorDate: 2023-07-27 04:10:43 +0000 Commit: Jessica Clarke <jrtc27@FreeBSD.org> CommitDate: 2023-07-27 04:10:43 +0000 bsd.compat.mk Extract _ALL_LIBCOMPATS and add related variables Adding these to a new bsd.compat.pre.mk will allow other parts of the tree to iterate over the set of possible libcompats (upper and/or lower) rather than having to hard-code the list. Reviewed by: brooks, jhb, emaste Differential Revision: https://reviews.freebsd.org/D41178 --- share/mk/bsd.compat.mk | 2 +- share/mk/bsd.compat.pre.mk | 13 +++++++++++++ 2 files changed, 14 insertions(+), 1 deletion(-) diff --git a/share/mk/bsd.compat.mk b/share/mk/bsd.compat.mk index 49fbfe3bf8e2..1584d2771127 100644 --- a/share/mk/bsd.compat.mk +++ b/share/mk/bsd.compat.mk @@ -3,7 +3,7 @@ .if !targets(__<${_this:T}>__) __<${_this:T}>__: -_ALL_LIBCOMPATS:= 32 +.include <bsd.compat.pre.mk> .if defined(_LIBCOMPATS) COMPAT_ARCH?= ${TARGET_ARCH} diff --git a/share/mk/bsd.compat.pre.mk b/share/mk/bsd.compat.pre.mk new file mode 100644 index 000000000000..05bdcb8a9f45 --- /dev/null +++ b/share/mk/bsd.compat.pre.mk @@ -0,0 +1,13 @@ +.if !targets(__<${_this:T}>__) +__<${_this:T}>__: + +_ALL_LIBCOMPATS:= 32 + +_ALL_libcompats:= ${_ALL_LIBCOMPATS:tl} + +# List of LIBCOMPAT libcompat pairs to avoid repeating this ugly expression. +# Can be used as: .for LIBCOMPAT libcompat in ${_ALL_LIBCOMPATS_libcompats} +_ALL_LIBCOMPATS_libcompats:= \ + ${_ALL_LIBCOMPATS:range:@i@${_ALL_LIBCOMPATS:[$i]} ${_ALL_libcompats:[$i]}@} + +.endif
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202307270411.36R4Boo3097453>