From nobody Sat Jan 22 19:03:38 2022 X-Original-To: dev-commits-src-main@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 E5B271973A15; Sat, 22 Jan 2022 19:03:38 +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 4Jh5Ht5zcDz3CRQ; Sat, 22 Jan 2022 19:03:38 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1642878218; 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=CVu0WuspJe6hpA6yfsL7ebC8GrGHFEbD4JD1cfJ/AaA=; b=vntBdMLosLyAnIZTJG3NUDdLJqWOj8V0+ShFRaq4h+0bLAf3dSB4zAVzFI/Tw/vT0W/Lrv qfYGL5Bpq88HxBzX7hBDcMVW33hJmcCCYTLhJ2p2cHY3kR8Z/0mrgiyPLc/1mMxjD12rhM P8QG1i54y6Aa5hffXIEq2b5LeRI8Vf9loxR262+ci3pa3eOrlMxVj7gExdPRIdbbOL1N3X JTt1+iyNbT5vz8TO644i+OrecCtYO+tb4ZJDLyxhvRoMZNftPOVxnC5s681UBoda753LXl Sz1Zrbnb/bqXeu4Y93LxTvd2eVew6KlgnmQVjiMBcm1IkU2jDkibrVrh8qzq0A== 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 AEE2C148F6; Sat, 22 Jan 2022 19:03:38 +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 20MJ3c56059858; Sat, 22 Jan 2022 19:03:38 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 20MJ3c4C059857; Sat, 22 Jan 2022 19:03:38 GMT (envelope-from git) Date: Sat, 22 Jan 2022 19:03:38 GMT Message-Id: <202201221903.20MJ3c4C059857@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Ed Maste Subject: git: 6f6fbfa3a835 - main - Remove quotes around Makefile .error/.warn/.info strings List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: emaste X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 6f6fbfa3a83578332f5605a97108ef28d6726c29 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1642878218; 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=CVu0WuspJe6hpA6yfsL7ebC8GrGHFEbD4JD1cfJ/AaA=; b=Fawfwp6VjOjYod8hOBSXNAtaL4/1YDCO3kTM54/PBqBcsZUFhEqwpdV2BqSFuuzYB2EblC eawn93RVYrXNgpgCbTa0qQhXTj1Nc7l/ZRL500w+hSmOmI98ke/o8z6LTNAJrMQ1t+u3Hr c6CSw8xPX65dMezKefiM9DZeW/fcV0x0MB6rYPACfFPe+ymgMUeRnNYsDEAUK8xDVMsDOS VNc/rNhw4LfDx0iSt08otdskm8YbJqCVnHN9rEC8MQ9+joQoZq4R+f44xaHiC0VsFBpFQY n9f2Ftm2Bl+CcScUDZMcfrkvixjmkaFLJS/9yjRICPABS/z35lj8j8sHhSBLfQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1642878218; a=rsa-sha256; cv=none; b=I2if6LRhBPiAAQNCkoxyKUosMcA+h9lzYJrcA1F/8uCC7Vi2HVZ8OjvSin/6vdnXhwt6o6 /GA3+s3cH3tm5Wjv5PTeTTZd14BJx91BM4OOepY1cieL/KwZmYyUWb1sjXtsNRQIDFXsOR UzX4StpXuAH5n5kaxbofBwAfJ8+KHO5t1HQIRb6nWaqbIgK520HE4rOHJjzBUYwkMFr9sh uXWlHuphbfMbw/mh2Gk6KXVpB2XlYVcdvQWLd1q0bQS3gWKXYCN+L/fvZ64Sryliq+xzGO aqeFDpJJgHSWthxzC8bj+lFzoLPSBS1Vphw5gbB8429R+1Ajw0qL0ILLmHVr+w== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by emaste: URL: https://cgit.FreeBSD.org/src/commit/?id=6f6fbfa3a83578332f5605a97108ef28d6726c29 commit 6f6fbfa3a83578332f5605a97108ef28d6726c29 Author: Ed Maste AuthorDate: 2022-01-15 21:20:24 +0000 Commit: Ed Maste CommitDate: 2022-01-22 19:03:07 +0000 Remove quotes around Makefile .error/.warn/.info strings The text after .error et al is emitted verbatim. Reviewed by: sjg Sponsored by: The FreeBSD Foundation Differential Revision: https://reviews.freebsd.org/D33904 --- Makefile | 2 +- Makefile.inc1 | 4 ++-- lib/Makefile | 2 +- lib/libc/tests/net/getaddrinfo/Makefile | 2 +- lib/libc/tests/ssp/Makefile | 2 +- share/zoneinfo/Makefile | 2 +- stand/i386/Makefile.inc | 2 +- tools/build/Makefile | 2 +- tools/build/mk/Makefile.boot | 2 +- usr.bin/mandoc/Makefile | 2 +- 10 files changed, 11 insertions(+), 11 deletions(-) diff --git a/Makefile b/Makefile index adba83592743..2b39f814250c 100644 --- a/Makefile +++ b/Makefile @@ -729,7 +729,7 @@ TARGET_ARCH_${kernel}!= cd ${KERNSRCDIR}/${TARGET}/conf && \ config -m ${KERNSRCDIR}/${TARGET}/conf/${kernel} 2> /dev/null | \ grep -v WARNING: | cut -f 2 .if empty(TARGET_ARCH_${kernel}) -.error "Target architecture for ${TARGET}/conf/${kernel} unknown. config(8) likely too old." +.error Target architecture for ${TARGET}/conf/${kernel} unknown. config(8) likely too old. .endif universe_kernconfs_${TARGET_ARCH_${kernel}}: universe_kernconf_${TARGET}_${kernel} universe_kernconf_${TARGET}_${kernel}: .MAKE diff --git a/Makefile.inc1 b/Makefile.inc1 index 3d958033f2b3..9a9d6586ddfc 100644 --- a/Makefile.inc1 +++ b/Makefile.inc1 @@ -49,7 +49,7 @@ # obj depend all install clean cleandepend cleanobj .if !defined(TARGET) || !defined(TARGET_ARCH) -.error "Both TARGET and TARGET_ARCH must be defined." +.error Both TARGET and TARGET_ARCH must be defined. .endif .if make(showconfig) || make(test-system-*) @@ -167,7 +167,7 @@ _t= ${TARGET_ARCH}/${TARGET} .if ${.MAKE.OS} != "FreeBSD" CROSSBUILD_HOST=${.MAKE.OS} .if ${.MAKE.OS} != "Linux" && ${.MAKE.OS} != "Darwin" -.warning "Unsupported crossbuild system: ${.MAKE.OS}. Build will probably fail!" +.warning Unsupported crossbuild system: ${.MAKE.OS}. Build will probably fail! .endif # We need to force NO_ROOT/DB_FROM_SRC builds when building on other operating # systems since the BSD.foo.dist specs contain users and groups that do not diff --git a/lib/Makefile b/lib/Makefile index 43c345daf356..d34f40616396 100644 --- a/lib/Makefile +++ b/lib/Makefile @@ -187,7 +187,7 @@ SUBDIR.${MK_STATS}+= libstats ${MACHINE_CPUARCH} == "powerpc") _libclang_rt= libclang_rt .elif (${MK_ASAN} != "no" || ${MK_UBSAN} != "no") && make(all) -.error "Requested build with sanitizers but cannot build runtime libraries!" +.error Requested build with sanitizers but cannot build runtime libraries! .endif .if ${MK_CXX} != "no" diff --git a/lib/libc/tests/net/getaddrinfo/Makefile b/lib/libc/tests/net/getaddrinfo/Makefile index 96b60d2a9792..edf335cd222f 100644 --- a/lib/libc/tests/net/getaddrinfo/Makefile +++ b/lib/libc/tests/net/getaddrinfo/Makefile @@ -8,7 +8,7 @@ TESTSRC= ${SRCTOP}/contrib/netbsd-tests/lib/libc/net/${.CURDIR:T} BINDIR= ${TESTSDIR} -.error "This testcase needs to be ported to FreeBSD (the output from getaddrinfo_test differs from NetBSD)" +.error This testcase needs to be ported to FreeBSD (the output from getaddrinfo_test differs from NetBSD) NETBSD_ATF_TESTS_SH= getaddrinfo_test diff --git a/lib/libc/tests/ssp/Makefile b/lib/libc/tests/ssp/Makefile index 452c57246e39..936ada01a760 100644 --- a/lib/libc/tests/ssp/Makefile +++ b/lib/libc/tests/ssp/Makefile @@ -38,7 +38,7 @@ PROGS+= h_raw LDADD.h_raw+= ${SANITIZER_LDFLAGS} .else .if make(all) -.info "Could not find runtime library ${_libclang_rt_ubsan}, skipping h_raw" +.info Could not find runtime library ${_libclang_rt_ubsan}, skipping h_raw .endif .endif .endif diff --git a/share/zoneinfo/Makefile b/share/zoneinfo/Makefile index 6e4cb51a63e3..0360b59288ab 100644 --- a/share/zoneinfo/Makefile +++ b/share/zoneinfo/Makefile @@ -39,7 +39,7 @@ CONTRIBDIR= ${SRCTOP}/contrib/tzdata/ .PATH: ${CONTRIBDIR} .if defined(LEAPSECONDS) -.warning "Using backwards compatibility variable for LEAPSECONDS; please use WITH_ZONEINFO_LEAPSECONDS_SUPPORT instead" +.warning Using backwards compatibility variable for LEAPSECONDS; please use WITH_ZONEINFO_LEAPSECONDS_SUPPORT instead MK_ZONEINFO_LEAPSECONDS_SUPPORT= yes .endif diff --git a/stand/i386/Makefile.inc b/stand/i386/Makefile.inc index 119f8a37162f..d12434487877 100644 --- a/stand/i386/Makefile.inc +++ b/stand/i386/Makefile.inc @@ -35,7 +35,7 @@ DO32=1 .if defined(LOADER_FIREWIRE_SUPPORT) MK_LOADER_FIREWIRE=yes -.warning "LOADER_FIREWIRE_SUPPORT deprecated, please move to WITH_LOADER_FIREWIRE" +.warning LOADER_FIREWIRE_SUPPORT deprecated, please move to WITH_LOADER_FIREWIRE .endif .include "../Makefile.inc" diff --git a/tools/build/Makefile b/tools/build/Makefile index b9eff032cb81..e39b418b744d 100644 --- a/tools/build/Makefile +++ b/tools/build/Makefile @@ -34,7 +34,7 @@ _MACOS_SDK_DIR=${_XCODE_ROOT}/Platforms/MacOSX.platform/Developer/SDKs/MacOSX.sd .endif HOST_INCLUDE_ROOT=${_MACOS_SDK_DIR}/usr/include .if !exists(${HOST_INCLUDE_ROOT}/stdio.h) -.error "You must install the macOS SDK (try xcode-select --install)" +.error You must install the macOS SDK (try xcode-select --install) .endif .else HOST_INCLUDE_ROOT=/usr/include diff --git a/tools/build/mk/Makefile.boot b/tools/build/mk/Makefile.boot index 4e6f3508b30d..138dff45930b 100644 --- a/tools/build/mk/Makefile.boot +++ b/tools/build/mk/Makefile.boot @@ -65,7 +65,7 @@ RANLIBFLAGS:= # MacOS ships /usr/lib/libarchive.dylib but doesn't provide the headers CFLAGS+= -idirafter ${SRCTOP}/contrib/libarchive/libarchive .else -.error "Unsupported build OS: ${.MAKE.OS}" +.error Unsupported build OS: ${.MAKE.OS} .endif .endif # ${.MAKE.OS} != "FreeBSD" diff --git a/usr.bin/mandoc/Makefile b/usr.bin/mandoc/Makefile index fcad5e8c16e9..f0b17349fac1 100644 --- a/usr.bin/mandoc/Makefile +++ b/usr.bin/mandoc/Makefile @@ -15,7 +15,7 @@ LINKS= ${BINDIR}/mandoc ${BINDIR}/whatis \ ${BINDIR}/mandoc ${BINDIR}/makewhatis \ ${BINDIR}/mandoc ${BINDIR}/apropos .elif defined(BOOTSTRAPPING) -.error "MK_MAN_UTILS should be set to yes when bootstrapping" +.error MK_MAN_UTILS should be set to yes when bootstrapping .endif LIBMAN_SRCS= man.c \