From nobody Thu Jul 27 04:11:50 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4RBHQb4Dwnz4pQ6j; Thu, 27 Jul 2023 04:11:51 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4RBHQb2bYnz3nDG; Thu, 27 Jul 2023 04:11:51 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1690431111; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=dZE2ngLSx+5yU3QeGrGJhc1kW3fsiWIY97ts4VdQbdI=; b=n4y84tVo3A7d7jlh0rIFC0pJkvzcWhodYoMatAbEQRs8ZPccnfm+hbWkOJWtG8nT7i/5z1 4D72MKV/Lh/7AJRRAUWb8FtJj9fp+O7baqsOnp5MZViA2rPpSSJY5BbRZQens+22SKRXAU Cp9YUumWskBwjO6frXfgF8Yoov3x8644MlKpCNK4ajXwlZaiWSVJYUre8s2KpI/BiYadY/ XXGzKtZHlhJslYwa0Uyy0SIjmptedTkz86okax+L4JwLpPlVpZv3WzUT718KYzK9JgUVm4 w5SH0IUbxlCE4ql+s3jJ22VIhJtZ4Ox/dvlQDqEQnxIm5FJlPXNVfrtZbEtGAA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1690431111; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=dZE2ngLSx+5yU3QeGrGJhc1kW3fsiWIY97ts4VdQbdI=; b=NeIndwDryk2jLzu2+eHcgHzZX9vGaM0N71ZGQfThApDpSmgK6QuIvmiAZemDU+5Nqx/4rH 0T4iP2AchVutGj277HlrnLEKfoNxCNuNxZfUtOn7vCmxKx9fvTfeBvf011E78dtz0hd1Qo WXWxLjsXxoh8jEU88mAF9p1hkpn9QeqEPwBkvrXNwSOV8854OpfoVf3cOeVoEU2Ntv8Nww WM04L3cGrA/qq11MsAp7kM+ew3Jg/oFQA2vnah+/XjfnVNLNN+gex5n8LY+efxk85BYcEn Bah5nUjkmsrkfy9nawDHVTgom77fGZICEqlgh/xoVxJCFp5SvQ65c+xfYQibfw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1690431111; a=rsa-sha256; cv=none; b=syQUCOdVz1D71Vv/iyLHtVrCS+gooAzfaq+fhtLmqC/KsnW49v0hv6lfyGfRREbY9pn3u1 YcOT/mB3U2c/e3n+3U/RoPdPfLHl7utuvKnnQ+00s6+CoUdjFH6km5//ivJP3rYuLfKzK0 ymSxo/FoRirCAQ3JKTbsetXi4wBnrBLbls9looOJpBCA71kfR9chwEVnfG8I98Hnh9FpNd RBMEi6o4xcDteE5B6bODAns+cOt9esVn9BSBB+deSy6fXX1+0+G3E7OOnnfWPDffLbcRxn /Kcr3gr0pUptIhPnWKcKNDcp95TbxCCaz71RQ4APH/6awFg7fwZA/IuQ/bAzWQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4RBHQb1T6kz19KQ; Thu, 27 Jul 2023 04:11:51 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 36R4Bofh097454; Thu, 27 Jul 2023 04:11:50 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 36R4Boo3097453; Thu, 27 Jul 2023 04:11:50 GMT (envelope-from git) Date: Thu, 27 Jul 2023 04:11:50 GMT Message-Id: <202307270411.36R4Boo3097453@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Jessica Clarke Subject: git: 5d6cb793d0d5 - main - bsd.compat.mk Extract _ALL_LIBCOMPATS and add related variables List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: jrtc27 X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 5d6cb793d0d56b3829168029b6940288f8fb61e6 Auto-Submitted: auto-generated The branch main has been updated by jrtc27: URL: https://cgit.FreeBSD.org/src/commit/?id=5d6cb793d0d56b3829168029b6940288f8fb61e6 commit 5d6cb793d0d56b3829168029b6940288f8fb61e6 Author: Jessica Clarke AuthorDate: 2023-07-27 04:10:43 +0000 Commit: Jessica Clarke 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 .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