From nobody Fri Jan 31 01:06:03 2025 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 4Ykd4X0CxDz5mNYp; Fri, 31 Jan 2025 01:06:04 +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 "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Ykd4W6gj1z3x4t; Fri, 31 Jan 2025 01:06:03 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1738285564; 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=ljvdfA5AnwZQthctcvPe8EXS27SQA8Y5sTFitpcRZbU=; b=bmw6riOnd7vne11TMq09oizDgcJC1zcmLMNH5qnmkpVU7+54sBP1+Bl02IQwu5TrxPjoZW iyb7wCPbPNqiMQwgnLXERx50qqbf9YJk2hbtOR7cpX9ubb7j1LVZHtrJBTvGe14uJDQXM5 LYYhMlYTdAkLNfC3RNl6F35R21rgUxc/33Cg0Pcc55WB2bbo8ry5ToasuOs0geK9G0WisQ otyo+oZYOr/WOU8ULsLwT2y6zXgS3okioERBML7NOedskwl7Vuyu3KLWwtttsu7cVGvyHI 7TizXlMVSfyKK++a8utt8gsgXUWGjrGgCehn2kkqT25HVyVVoQH/3NDdE/+vLA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1738285563; 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=ljvdfA5AnwZQthctcvPe8EXS27SQA8Y5sTFitpcRZbU=; b=wZ4yaLE6tftwXxccXQNVPm8XuyoFXq0jAlvqSdEQTHmM8QY5piDXdZbfTTjJS/rLogxUar 2rsBoJptW1YpiUsNy7/3QAnZblltZzL1HfLnDKr0nsRdXAyt2YPAPVQsuRJm1CTq8cXG+c lY8eMSDlvBTmI2tYkf5lkzwtvDFiP+2m8yia/4oYnYH0rPW03nXLiT9BCu2fo/JXcyH21I uD/MMCQ7y4DXPrlAZCkBhH6LanuuDSYXH0hcUNwJQtt158B92xO0JWsJ8ENhDCCJNtESH1 L6Pw0CeUu+j3d384As9iUs67FLC+0sBmLhpkdYyimvqj4VC7atDkXL8NL1aikw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1738285563; a=rsa-sha256; cv=none; b=DtHxFrVtY1/lRLVnctqvnV1fuETGyOeGZFkmSlSFg7fT727v9qsQVLDXC8Sm91wGTv1xqf n5lNMxcTVBdrs069W+RUHVq3GwZIyO2jhyuiVn+S0lYwKZlKJEpjMkdi6AmY+E9K/VIyiI keGQAvvr03Q2CEak2vq8Cdg8k9pqUaZyC0mgNQsMMlZrT3ESJx1LLrJ8k4hrtzPPhW1nV2 fSP1Ajio1xBDyLd+GBGFp9/0/0vEf9hj4pKx2DqWUrFpZSaxeGr4XkCezIBO6xio2IcUXl gxqx1RKY1zc6DRB8LHMKnjq1tlApnpdCqRrKofo4de2D9HpsCsOY1rJn0VxiPQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none 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 4Ykd4W5zlsz19tv; Fri, 31 Jan 2025 01:06:03 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 50V163RR055285; Fri, 31 Jan 2025 01:06:03 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 50V163Fn055282; Fri, 31 Jan 2025 01:06:03 GMT (envelope-from git) Date: Fri, 31 Jan 2025 01:06:03 GMT Message-Id: <202501310106.50V163Fn055282@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: "Simon J. Gerraty" Subject: git: a69ac6ee7914 - main - Fix mangled bmake makefile 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: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: sjg X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: a69ac6ee79143476abc044346aa28822324f33a6 Auto-Submitted: auto-generated The branch main has been updated by sjg: URL: https://cgit.FreeBSD.org/src/commit/?id=a69ac6ee79143476abc044346aa28822324f33a6 commit a69ac6ee79143476abc044346aa28822324f33a6 Author: Simon J. Gerraty AuthorDate: 2025-01-31 01:02:45 +0000 Commit: Simon J. Gerraty CommitDate: 2025-01-31 01:02:45 +0000 Fix mangled bmake makefile --- usr.bin/bmake/Makefile | 38 +++++++++++++++++++------------------- 1 file changed, 19 insertions(+), 19 deletions(-) diff --git a/usr.bin/bmake/Makefile b/usr.bin/bmake/Makefile index 43e1ef99b635..9a146246df0d 100644 --- a/usr.bin/bmake/Makefile +++ b/usr.bin/bmake/Makefile @@ -49,45 +49,45 @@ SRCS.${MAN} = ${srcdir}/make.1 .-include "Makefile.config" .if !empty(LIBOBJS) -SRCS += ${LIBOBJS:T:.o =.c} +SRCS += ${LIBOBJS:T:.o=.c} .endif # just in case prefix ?= /usr srcdir ?= ${.PARSEDIR} -srcdir : = ${srcdir} +srcdir := ${srcdir} DEFAULT_SYS_PATH ?= ${prefix}/share/mk CPPFLAGS += -DUSE_META CFLAGS += ${CPPFLAGS} -CFLAGS += -D_PATH_DEFSYSPATH =\"${DEFAULT_SYS_PATH}\" +CFLAGS += -D_PATH_DEFSYSPATH=\"${DEFAULT_SYS_PATH}\" CFLAGS += -I. -I${srcdir} ${XDEFS} -DMAKE_NATIVE CFLAGS += ${COPTS.${.ALLSRC:M*.c:T:u}} -COPTS.main.c += "-DMAKE_VERSION =\"${_MAKE_VERSION}\"" +COPTS.main.c += "-DMAKE_VERSION=\"${_MAKE_VERSION}\"" .for x in FORCE_MAKE_OS FORCE_MACHINE FORCE_MACHINE_ARCH .ifdef $x -COPTS.main.c += "-D$x =\"${$x}\"" +COPTS.main.c += "-D$x=\"${$x}\"" .endif .endfor # meta mode can be useful even without filemon # should be set by now USE_FILEMON ?= no -.if ${USE_FILEMON:tl} ! = "no" +.if ${USE_FILEMON:tl} != "no" .PATH: ${srcdir}/filemon SRCS += filemon_${USE_FILEMON}.c COPTS.meta.c += -DUSE_FILEMON -DUSE_FILEMON_${USE_FILEMON:tu} COPTS.job.c += ${COPTS.meta.c} -.if ${USE_FILEMON} = = "dev" +.if ${USE_FILEMON} == "dev" FILEMON_H ?= /usr/include/dev/filemon/filemon.h -.if exists(${FILEMON_H}) && ${FILEMON_H:T} = = "filemon.h" +.if exists(${FILEMON_H}) && ${FILEMON_H:T} == "filemon.h" COPTS.filemon_dev.c += -DHAVE_FILEMON_H -I${FILEMON_H:H} .endif -.elif ${USE_FILEMON} = = "ktrace" -COPTS.filemon_ktrace.c += -Wno-error =unused-parameter +.elif ${USE_FILEMON} == "ktrace" +COPTS.filemon_ktrace.c += -Wno-error=unused-parameter .endif .endif # USE_FILEMON @@ -101,12 +101,12 @@ SUBDIR.${MK_TESTS} += unit-tests MAN1 = ${MAN} -.if ${MK_GEN_MAN:Uno} = = "yes" +.if ${MK_GEN_MAN:Uno} == "yes" # we use this to generate ${MAN} .include <${srcdir}/mk/genfiles.mk> -.if ${PROG} ! = "make" +.if ${PROG} != "make" CLEANFILES += my.history SED_CMDS.${MAN} += \ -e '/^.Dt/s/MAKE/${PROG:tu}/' \ @@ -114,7 +114,7 @@ SED_CMDS.${MAN} += \ .endif -.if ${CLEANFILES:U:Mmy.history} ! = "" +.if ${CLEANFILES:U:Mmy.history} != "" ${MAN}: my.history my.history: @(echo ".Nm"; \ @@ -129,7 +129,7 @@ SED_CMDS.${MAN} += \ .endif -.if ${.MAKE.OS:N*BSD} ! = "" +.if ${.MAKE.OS:N*BSD} != "" # assume .Nx is not supported SED_CMDS.${MAN} += -e 's/^\.Nx/NetBSD/' .endif @@ -140,14 +140,14 @@ SED_CMDS.${MAN} += -e 's/^\.Nx/NetBSD/' ${MAN}: ${SRCS.${MAN}} _GENFILES_USE all man beforeinstall: ${MAN} -_mfromdir =. +_mfromdir = . .endif .endif # MK_GEN_MAN MANTARGET ?= cat MANDEST ?= ${MANDIR}/${MANTARGET}1 -.if ${MANTARGET} = = "cat" +.if ${MANTARGET} == "cat" _mfromdir = ${srcdir} .endif @@ -171,14 +171,14 @@ ${OBJS}: config.h TEST_MAKE ?= ${.OBJDIR}/${PROG:T} accept test: .NOMETA cd ${.CURDIR}/unit-tests && \ - MAKEFLAGS = ${TEST_MAKE} -r -m / ${.TARGET} ${TESTS:DTESTS =${TESTS:Q}} + MAKEFLAGS= ${TEST_MAKE} -r -m / ${.TARGET} ${TESTS:DTESTS=${TESTS:Q}} -.if make(test) && ${MK_AUTO_OBJ} = = "yes" +.if make(test) && ${MK_AUTO_OBJ} == "yes" # The test target above visits unit-tests with -r -m / # which prevents MK_AUTO_OBJ doing its job # so do it here -.if defined(MAKEOBJDIRPREFIX) || ${MAKEOBJDIR:U:M*/*} ! = "" +.if defined(MAKEOBJDIRPREFIX) || ${MAKEOBJDIR:U:M*/*} != "" _utobj = ${.OBJDIR}/unit-tests .else _utobj = ${.CURDIR}/unit-tests/${MAKEOBJDIR:Uobj}