From nobody Sat Feb 05 00:01:17 2022 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 38E4919BFC59; Sat, 5 Feb 2022 00:01:18 +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 4JrCHL0qV0z4sbs; Sat, 5 Feb 2022 00:01:18 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1644019278; 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=viLZ9DwmdTeA/wbrd/OKdJFyI4pGTyDR8OVAuo4rXOY=; b=b0NVB7a2p0x+tH6HsRFhTSjJW8NSb7BUB6bccD/mNyO4n2XpUeHTAfE/3J+VMMFV+3rdwg xfTg9GRN3wroLU7CTvu50YBPYkiwvBM3n6Z3SUnYDfRPh+eCBxhlJri1zuMKpuUvJXDsUo +tNMKCXXux0FtdqmfRNzrg00cknOesv0toPRsR+Haeyod+k+b7Wo3eh38GKEF5OHngfyz5 xoj17XhBOk8plLtUMiAWYHSggLbd/lF5L7hLVMsT5kCrXwhR34KFhsbYrAXfoRHz/p5ymt usOB1auz3dwQU0ssyu3XFLGYWVwn2o1AObIZMTezSKCxZr+q5cslU4Jc6AY79w== 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 F00BA15484; Sat, 5 Feb 2022 00:01:17 +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 21501HYq024041; Sat, 5 Feb 2022 00:01:17 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 21501Hup024040; Sat, 5 Feb 2022 00:01:17 GMT (envelope-from git) Date: Sat, 5 Feb 2022 00:01:17 GMT Message-Id: <202202050001.21501Hup024040@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: John Baldwin Subject: git: ffe74ab77f23 - main - bsd.compat.mk: A few cosmetic fixes. 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: jhb X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: ffe74ab77f234fabe691bd79e254cd000e07dfe0 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1644019278; 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=viLZ9DwmdTeA/wbrd/OKdJFyI4pGTyDR8OVAuo4rXOY=; b=HSUmMAvzdcaxlpf+8Rq7ampupsQ2KG5NZNPvtEzaAF5+LAjkScSeZeYKQYaVWEsXSmOxVn uLgRQpw5mISim5abN+a4OQ0ivhxabXUWYh26TssAG6KyktLrmU5PDC3FzdM9frPSPJl6bX 5AhP4xVgXF7tCyAeERzd1w1XN/vhRV5oO+TORca1d0ig3l7mzghFQMbztX/KyMrKTm/FVh +XH4ZAQRaYs+Tcog40gg26dcrb3kIAnXtqRZSij31MpMJa6Jbjh7oGyikXCuGc4qDXPW6O w+siM3254ZEL+dgL5Ieei2gLWkokHhp+zyntD52Sf9weLTzVEH1jO6tjCcD3QQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1644019278; a=rsa-sha256; cv=none; b=eCjQxSN2IGNVbc1m0etaWH6bg3wRnNFhsdsEDwKIDIoSJdyVZxbxOgHnV/f2f9GXkpDLSq WjtnnVebWQEg5E+nWIred0Y9tPQsGin2awWiWW6/Bi60T0En8UrNPmZ3SiNirH26dGe/ao tZ3iI5gKR6sqm83jetJfaFzptn4zGNYLPD0Ld2QUwcLxtAkI+dswBQGgUkVxTlf/MPQ/ug uo5mmCwR3Ykryip9jqEiAqGHAhYhrxLAg1T8j65tYGaslrVDqtiZRk+hI3ThdfwTZWM2sw iQhBMN0FnA2rQJVZPozd3HUODRtjEEhEeTIbUdkT8fScTjLQVdSmv/Zi5P4h/A== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by jhb: URL: https://cgit.FreeBSD.org/src/commit/?id=ffe74ab77f234fabe691bd79e254cd000e07dfe0 commit ffe74ab77f234fabe691bd79e254cd000e07dfe0 Author: John Baldwin AuthorDate: 2022-02-04 23:57:28 +0000 Commit: John Baldwin CommitDate: 2022-02-04 23:57:28 +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 --- 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 fa6391b1adc2..6a7d3d3c7e80 100644 --- a/share/mk/bsd.compat.mk +++ b/share/mk/bsd.compat.mk @@ -71,9 +71,9 @@ LIB32WMAKEFLAGS+= -DCOMPAT_32BIT # 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 @@ -90,7 +90,6 @@ _LIBCOMPAT:= ${WANT_COMPAT} .endif .endif - # ------------------------------------------------------------------- # Generic code for each type. # Set defaults based on type.