From nobody Fri Apr 29 23:12:40 2022 X-Original-To: dev-commits-src-branches@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 810171ABD1C5; Fri, 29 Apr 2022 23:12:42 +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 4KqpDT5wcdz3wKB; Fri, 29 Apr 2022 23:12:41 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1651273962; 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=Wh8JubiZ8reG6YF6VQ4aqLcxUraqZKWMHC7mrQYvWsQ=; b=SsXus039tH5zyIg2f5NeRPFgCoxiNnu0kmIO/IauIqxsDpo33JOH+/M7Aayj7Tw6h1ATb3 Z5O08gXCu9a4SkRclx2EVmV8UI7OZ4riiQ7h97+MSZFXept1pjnXzTtAEI1ebCxU/IQc1j X/oERUhwVpxfNMaag7zJYkZRyHDvwCwdAYFsBrj3f0kze8UY+ZmGk42pEGzb1iFUHaDdK0 8vkEoM1WnxK9zKknS9pIvUU1GRtq1EyiOb65oCUk1J8b4qtu9KIZ39P8wXaPtToKduV3bD DFaNRvv1XvWsLcSF0uuquXf0YfQFKHjZX0MDj+bWdXQbckgHriFAdQpxNRE+ng== 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 EBE6915C7F; Fri, 29 Apr 2022 23:12:40 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 23TNCedk044973; Fri, 29 Apr 2022 23:12:40 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 23TNCet2044972; Fri, 29 Apr 2022 23:12:40 GMT (envelope-from git) Date: Fri, 29 Apr 2022 23:12:40 GMT Message-Id: <202204292312.23TNCet2044972@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: John Baldwin Subject: git: d826802c44b1 - stable/13 - bsd.compat.mk: A few cosmetic fixes. List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-branches@freebsd.org X-BeenThere: dev-commits-src-branches@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: jhb X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: d826802c44b191abf7065c1b9d1a0abde75a8ceb Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1651273962; 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=Wh8JubiZ8reG6YF6VQ4aqLcxUraqZKWMHC7mrQYvWsQ=; b=VYhUdOIMhl2k03zqWyjAMF7Gj1VwYE+o2oI+MQkObbTxcHjXAqd6wT5eyvMNi97UZ7tJ2J Xae3twuxsIo5neZE5hExop1eaO0M2/e4zKsr7r+babtBQjjJGhEMDh8uzJamqYrzfwQ+sK vSFclwP4Ays0hzI9Bovjb8QxaqLWd44gg0FY5lf4QG8dGukjlJYHtynXb1smmunwZ45ewX Y9jBMDawchatNztEnTmKBF/qm7TTPH5O/dWsuhEVAkIJvVe7jKuc+Jk0rE9xfmCzuofa84 +WpgdtJq9s74Dl0L3BFavj6+4MAzf3GwD0m2VlPZyt6SlQnic31o97pggiJDYA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1651273962; a=rsa-sha256; cv=none; b=fPpqAMbs/XD39JJOtzvMlVCjWT5/Z+kHsMizUtctdznjE7v8i6hAHFtEMCBVYff3b3yaqP ekOw1Fxo4HrP7nE3kd/N9SKWEPthX9vyafoKUe3QE1vlvBNGH0E2LueZuCnPhIjtsW29Id ahaQjqfACNIGuKWI+mPmF/fek4XORPCHX7xyPA/k33qGef6iDgIR/c5e94f7DzpsNf5mQn B+tjh8JYhFYudvxxol0lUEmgmiBfpqka7mivAOUY+tEAfP4Evk6ZI0G2sh0Gvn7YAhNmFS ofi5WwAsEIm1DGR7PqNFr3mEY8lrjsM3VwqBcCvfNSfzWAhIxxG6gclL1KbGMA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch stable/13 has been updated by jhb: URL: https://cgit.FreeBSD.org/src/commit/?id=d826802c44b191abf7065c1b9d1a0abde75a8ceb commit d826802c44b191abf7065c1b9d1a0abde75a8ceb Author: John Baldwin AuthorDate: 2022-02-04 23:57:28 +0000 Commit: John Baldwin CommitDate: 2022-04-29 23:07:24 +0000 bsd.compat.mk: A few cosmetic fixes. - Add a missing ')' to a warning. - Consistently use {} when expanding variables. - Remove a spurious blank line. Reviewed by: imp, emaste Obtained from: CheriBSD Differential Revision: https://reviews.freebsd.org/D34172 (cherry picked from commit ffe74ab77f234fabe691bd79e254cd000e07dfe0) --- share/mk/bsd.compat.mk | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/share/mk/bsd.compat.mk b/share/mk/bsd.compat.mk index 91b2e078cc46..45a8a8c48967 100644 --- a/share/mk/bsd.compat.mk +++ b/share/mk/bsd.compat.mk @@ -109,9 +109,9 @@ LIBSOFTWMAKEFLAGS= -DCOMPAT_SOFTFP # In the program linking case, select LIBCOMPAT .if defined(NEED_COMPAT) .ifndef HAS_COMPAT -.warning NEED_COMPAT defined, but no LIBCOMPAT is available (COMPAT_ARCH == ${COMPAT_ARCH} +.warning NEED_COMPAT defined, but no LIBCOMPAT is available (COMPAT_ARCH == ${COMPAT_ARCH}) .elif !${HAS_COMPAT:M${NEED_COMPAT}} && ${NEED_COMPAT} != "any" -.error NEED_COMPAT (${NEED_COMPAT}) defined, but not in HAS_COMPAT ($HAS_COMPAT) +.error NEED_COMPAT (${NEED_COMPAT}) defined, but not in HAS_COMPAT (${HAS_COMPAT}) .elif ${NEED_COMPAT} == "any" .endif .ifdef WANT_COMPAT @@ -128,7 +128,6 @@ _LIBCOMPAT:= ${WANT_COMPAT} .endif .endif - # ------------------------------------------------------------------- # Generic code for each type. # Set defaults based on type.