From nobody Sat Feb 05 00:01:20 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 3E16C19BFD6E; Sat, 5 Feb 2022 00:01:21 +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 4JrCHN40Skz4swb; Sat, 5 Feb 2022 00:01:20 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1644019280; 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=D7Qmtdo0jUrJPJiaG9MJLTISszF8d8dgpX2bdiXdAWM=; b=xIceTiwGj0/RhJ+LpT+UDRGMFm2KPPmRxbxIbHbXDBrHmzGzo+Iq4rEv1Ilsl+ioWVX6nX w93U24ko5uOUeaqzC0TRmhFYOoQsaydoIp/tP0iaj+TiQyK8gS5I55JHOikp7hWlFTuuB2 jwdjTBFLS5PtGDVoE+SjMc3mCIX6h05ESPrUegqJlbFmGvLp/GqLchBtKC2yYjSaXXM7yD WKpjCN9Xm4m8OcUp4LcMhOqVbvLfrmBakiddPWyEY2MHLr5qbCxXW+XqKNbbIzNZhLDAmu 893cL5ZE6vgMJ0+n0WNUqdklymX6HArLWHzcJ6bJIajC9WH+FnhYJ0Z1u+sQnw== 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 4C18A15391; Sat, 5 Feb 2022 00:01:20 +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 21501KVj024089; Sat, 5 Feb 2022 00:01:20 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 21501KPI024088; Sat, 5 Feb 2022 00:01:20 GMT (envelope-from git) Date: Sat, 5 Feb 2022 00:01:20 GMT Message-Id: <202202050001.21501KPI024088@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: bca92be68309 - main - Remove more quotes around Makefile .error/.warn/.info strings. 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: bca92be68309e9b0c8f1c1c0a9ca87081c4ab27d Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1644019280; 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=D7Qmtdo0jUrJPJiaG9MJLTISszF8d8dgpX2bdiXdAWM=; b=AwjzdENgf/rTz9iGbry2BRMgdurTwh4P+oFRBTATw5HwrOJ/jcZpRgnhW0Yk+6Y50eRqHz +CZeLwF4e7Y2WWagcqxWGYXy1xs1VChV0De0OnF6ro769b6KWeod7iZhtxR6/NjuOFHYZI zYHA3Rbs77KNxfMxMZof9lIc+nK+ZyekU/yKmz2HnD+Hh5Z02vGnUNZVH+xsXKsiiOuj1B 9lNRcBWXX8SN+vz3/LdQ3IQhxIiUrE9/9axudzd2bznjNzAOvwWHAbkZTVW5NrKpruvYLw dLJ9JHTZAMEM+HCFPBlOH2++J3k12rdG+DZtylpyuCIdp6D8KBtPk4pe4lV65w== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1644019280; a=rsa-sha256; cv=none; b=wcffysAYTRqCvHiAubkBTe/0UahzMqFdq2T0Ah0lBi/g6ZRne7Gdxha9oPcRNS60GnMoXO h1TAAvgCMIt5f81yprR9nP2iOjV/C2a/WOI7xO9deh6PIrOcqlpsYZZDfqXNxFw3JxgHze uXYvQyVUeEKnJ7tMTIE/rN6iWKB0iGOWAAOKtWc0WJEq1UQv7T/x9/wa9oPkC7Ct2qv4WJ pCW3rO8qne+ypCFvu+YIM4RQkK5QA5HMSjJVlImy5x0d1gR64hWGOdJzxensMWrtx5RKPK SyM/Nz5IfDrpokCjikuaLPA+HaM5b7ygSH2STaWPUt40fhH1hGp5n+GnC42XWw== 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=bca92be68309e9b0c8f1c1c0a9ca87081c4ab27d commit bca92be68309e9b0c8f1c1c0a9ca87081c4ab27d Author: John Baldwin AuthorDate: 2022-02-04 23:59:00 +0000 Commit: John Baldwin CommitDate: 2022-02-04 23:59:53 +0000 Remove more quotes around Makefile .error/.warn/.info strings. Reviewed by: imp, emaste Differential Revision: https://reviews.freebsd.org/D34175 --- Makefile.inc1 | 2 +- share/mk/bsd.compiler.mk | 2 +- share/mk/bsd.dep.mk | 6 +++--- share/mk/bsd.endian.mk | 2 +- share/mk/bsd.linker.mk | 2 +- share/mk/bsd.mkopt.mk | 8 ++++---- share/mk/bsd.opts.mk | 2 +- share/mk/bsd.sanitizer.mk | 2 +- share/mk/netbsd-tests.test.mk | 2 +- 9 files changed, 14 insertions(+), 14 deletions(-) diff --git a/Makefile.inc1 b/Makefile.inc1 index dc102d63e4ae..d27a81d7904d 100644 --- a/Makefile.inc1 +++ b/Makefile.inc1 @@ -626,7 +626,7 @@ TMPPATH= ${STRICTTMPPATH}:${PATH} .if ${BUILD_WITH_STRICT_TMPPATH} != 0 MKTEMP=${WORLDTMP}/legacy/usr/bin/mktemp .if !exists(${MKTEMP}) -.error "mktemp binary doesn't exist in expected location: ${MKTEMP}" +.error mktemp binary doesn't exist in expected location: ${MKTEMP} .endif .else MKTEMP=mktemp diff --git a/share/mk/bsd.compiler.mk b/share/mk/bsd.compiler.mk index 4a1472c6bfab..c8fb9e1ba4a8 100644 --- a/share/mk/bsd.compiler.mk +++ b/share/mk/bsd.compiler.mk @@ -160,7 +160,7 @@ _can_export= yes .for var in ${_exported_vars} .if defined(${var}) && (!defined(${var}__${${X_}_cc_hash}) || ${${var}__${${X_}_cc_hash}} != ${${var}}) .if defined(${var}__${${X_}_ld_hash}) -.info "Cannot import ${X_}COMPILER variables since cached ${var} is different: ${${var}__${${X_}_cc_hash}} != ${${var}}" +.info Cannot import ${X_}COMPILER variables since cached ${var} is different: ${${var}__${${X_}_cc_hash}} != ${${var}} .endif _can_export= no .endif diff --git a/share/mk/bsd.dep.mk b/share/mk/bsd.dep.mk index d1bbdd722c1b..105a724ebd5b 100644 --- a/share/mk/bsd.dep.mk +++ b/share/mk/bsd.dep.mk @@ -199,11 +199,11 @@ DEPEND_FILTER= C,/,_,g # Absolute paths to OBJS should be an error inside ${SRCTOP}, but some users # might be relying on this feature, so add an opt-out mechanism. .if defined(SRCTOP) && ${OBJS:M${SRCTOP}*} -.error "$$OBJS inside $$SRCTOP not allowed: ${OBJS:M${SRCTOP}*}" +.error $$OBJS inside $$SRCTOP not allowed: ${OBJS:M${SRCTOP}*} .elif ${OBJS:N${_ABSOLUTE_PATH_OBJS}:M/*} -.error "$$OBJS absolute path not allowed: ${OBJS:N${_ABSOLUTE_PATH_OBJS}:M/*}. \ +.error $$OBJS absolute path not allowed: ${OBJS:N${_ABSOLUTE_PATH_OBJS}:M/*}.\ If this is intended, add them to _ABSOLUTE_PATH_OBJS to silence this error\ - or define _ALLOW_ABSOLUTE_OBJ_PATH to disable this diagnostic." + or define _ALLOW_ABSOLUTE_OBJ_PATH to disable this diagnostic. .endif .endif DEPENDOBJS+= ${OBJS} diff --git a/share/mk/bsd.endian.mk b/share/mk/bsd.endian.mk index 61a71add062d..e6151eebfa8f 100644 --- a/share/mk/bsd.endian.mk +++ b/share/mk/bsd.endian.mk @@ -16,7 +16,7 @@ TARGET_ENDIANNESS= 4321 CAP_MKDB_ENDIAN= -b LOCALEDEF_ENDIAN= -b .elif ${.MAKE.OS} == "FreeBSD" -.error "Don't know the endian of this architecture" +.error Don't know the endian of this architecture .else # # During bootstrapping on !FreeBSD OSes, we need to define some value. Short of diff --git a/share/mk/bsd.linker.mk b/share/mk/bsd.linker.mk index 7209d7f173ae..81275281be34 100644 --- a/share/mk/bsd.linker.mk +++ b/share/mk/bsd.linker.mk @@ -46,7 +46,7 @@ _can_export= yes .for var in ${_exported_vars} .if defined(${var}) && (!defined(${var}__${${X_}_ld_hash}) || ${${var}__${${X_}_ld_hash}} != ${${var}}) .if defined(${var}__${${X_}_ld_hash}) -.info "Cannot import ${X_}LINKER variables since cached ${var} is different: ${${var}__${${X_}_ld_hash}} != ${${var}}" +.info Cannot import ${X_}LINKER variables since cached ${var} is different: ${${var}__${${X_}_ld_hash}} != ${${var}} .endif _can_export= no .endif diff --git a/share/mk/bsd.mkopt.mk b/share/mk/bsd.mkopt.mk index 794f4108b7d7..3c6675b402cc 100644 --- a/share/mk/bsd.mkopt.mk +++ b/share/mk/bsd.mkopt.mk @@ -37,7 +37,7 @@ .for var in ${__DEFAULT_YES_OPTIONS} .if !defined(MK_${var}) .if defined(WITH_${var}) && ${WITH_${var}} == "no" -.warning "Use WITHOUT_${var}=1 instead of WITH_${var}=no" +.warning Use WITHOUT_${var}=1 instead of WITH_${var}=no .endif .if defined(WITHOUT_${var}) # WITHOUT always wins MK_${var}:= no @@ -46,7 +46,7 @@ MK_${var}:= yes .endif .else .if ${MK_${var}} != "yes" && ${MK_${var}} != "no" -.error "Illegal value for MK_${var}: ${MK_${var}}" +.error Illegal value for MK_${var}: ${MK_${var}} .endif .endif # !defined(MK_${var}) .endfor @@ -58,7 +58,7 @@ MK_${var}:= yes .for var in ${__DEFAULT_NO_OPTIONS} .if !defined(MK_${var}) .if defined(WITH_${var}) && ${WITH_${var}} == "no" -.warning "Use WITHOUT_${var}=1 instead of WITH_${var}=no" +.warning Use WITHOUT_${var}=1 instead of WITH_${var}=no .endif .if defined(WITH_${var}) && !defined(WITHOUT_${var}) # WITHOUT always wins MK_${var}:= yes @@ -67,7 +67,7 @@ MK_${var}:= no .endif .else .if ${MK_${var}} != "yes" && ${MK_${var}} != "no" -.error "Illegal value for MK_${var}: ${MK_${var}}" +.error Illegal value for MK_${var}: ${MK_${var}} .endif .endif # !defined(MK_${var}) .endfor diff --git a/share/mk/bsd.opts.mk b/share/mk/bsd.opts.mk index c3c29962b2f5..7e5c985957f0 100644 --- a/share/mk/bsd.opts.mk +++ b/share/mk/bsd.opts.mk @@ -124,7 +124,7 @@ __DEFAULT_YES_OPTIONS+=PIE WARNS \ WERROR .if defined(NO_${var}) -.error "NO_${var} is defined, but deprecated. Please use MK_${var}=no instead." +.error NO_${var} is defined, but deprecated. Please use MK_${var}=no instead. MK_${var}:=no .endif .endfor diff --git a/share/mk/bsd.sanitizer.mk b/share/mk/bsd.sanitizer.mk index 6b79bc467404..31aecd9e578e 100644 --- a/share/mk/bsd.sanitizer.mk +++ b/share/mk/bsd.sanitizer.mk @@ -24,7 +24,7 @@ _use_sanitizers= yes .if !defined(BOOTSTRAPPING) && ${_use_sanitizers} != "no" && \ ${COMPILER_TYPE} != "clang" && make(all) -.error "Sanitizer instrumentation currently only supported with clang" +.error Sanitizer instrumentation currently only supported with clang .endif # For libraries we only instrument the shared and PIE libraries by setting diff --git a/share/mk/netbsd-tests.test.mk b/share/mk/netbsd-tests.test.mk index c1c9f91a4a6d..bbcbe7d4e652 100644 --- a/share/mk/netbsd-tests.test.mk +++ b/share/mk/netbsd-tests.test.mk @@ -6,7 +6,7 @@ __netbsd_tests.test.mk__: TESTSRC?= ${SRCTOP}/contrib/netbsd-tests/${RELDIR:H} .if !exists(${TESTSRC}/) -.error "Please define TESTSRC to the absolute path of the test sources, e.g. $${SRCTOP}/contrib/netbsd-tests/lib/libc/stdio" +.error Please define TESTSRC to the absolute path of the test sources, e.g. $${SRCTOP}/contrib/netbsd-tests/lib/libc/stdio .endif .PATH: ${TESTSRC}