From nobody Tue May 14 05:22:41 2024 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 4Vdl9g4KPgz5KQbG; Tue, 14 May 2024 05:22:47 +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 4Vdl9g3Ts8z4g3J; Tue, 14 May 2024 05:22:47 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1715664167; 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=LoQvnNCZ0BIvlFrW6U8Kc/gfiwEEL8N8l/qriV/qzF0=; b=jD5KUXfj5DpsVwfBk4PEMGavXaTx4u6A9fC3FjuJBRNwvUnXN3EFLq8BM+3huHfnQDDX8K RGK0HNyvV/3w0DShGAUI82fDFpB8B7mpvKzGNepWQY08OvZx0/AMcdY7D87Rfplnc0UAuC hxKDF3SiviGauv3UPcHzbMkFo7qKKPy1Thb8/uHfCx6UNFVY37alfC+Jrvswq/JC8Ooptn nzg1E+RB419WU5tlecIoR/wTNpBKHL+Wo9RBWtymyYM/oNvix9uWch2F0AVsPm8i2YbMvN fIRt0M5uRyfvyKQXpVsdhHdopkxbVAThjRRxZwOf4kuRNRQCiqt3dPFsWEE8sA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1715664167; a=rsa-sha256; cv=none; b=ggxiq+METaIWKzEeZpcGINZgJguYzMbs1UZmqT8Bob5h8rWdEt/whmBHygnyJ05E8CP6yG ijMyOPc4eYf62Djc13djpOQ5t670BPEvhrbEZDESy7Cp8tnwhiXciBzF+4/skO5YHJGVUM HQWkjcE6ksDTrjgez89YGzMGSgdyowsDhTptCAjpQoTMCoqAw4tO0D1cVjK4aRcZSdg1Ez tzW8FAbmUTUu9G3Dh6U4cTGvicManWJ54hPj2wmsFr49DLy2ahBjB1ZmlPabsYRcLNdMsJ mVeaORDub6k9nAIUX1NxcWrk1rjOMfIwmo1E/ZOsWzStjYx7e71ATkbjVji6NQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1715664167; 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=LoQvnNCZ0BIvlFrW6U8Kc/gfiwEEL8N8l/qriV/qzF0=; b=U4W/GbM36bPy9p+KGU4HmOgFmcF4TtHomJEFhSCZ/UZRHbygBb6S51xcqFTIjUL+fGK9cX uPMmOOZ20IFn0nGH6jj///uDxOIhtiO9kLx7od2uH8ugEi3waajmjig4ZhdnS/dXbBTKQr YBEFnIjpebetvnjYsPIwcgd/RCJZIKl4MzkgDZ8hV0xyHjLIYxrs5/9+xgOe+FstpJxTiG UUOC/cjbGvs5TV1N3/PZ8QHt9p1O+nMBPV8Sxdz7zofVxFTjNEPqpLyXUTOIh4TlSoNF/9 7V+MYiJ17k4mCvitkghdAHSthaiphAyi7XSbIlfwsORDSdm8FZu1G74uyaaaZQ== 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 4Vdl9g35v1zJCt; Tue, 14 May 2024 05:22:47 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 44E5Mlf3052727; Tue, 14 May 2024 05:22:47 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 44E5MfWe052718; Tue, 14 May 2024 05:22:41 GMT (envelope-from git) Date: Tue, 14 May 2024 05:22:41 GMT Message-Id: <202405140522.44E5MfWe052718@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: c9f4001f81c4 - main - Merge bmake-20240508 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: c9f4001f81c4d5778f70f77dc9892d1c4ecfdcdb Auto-Submitted: auto-generated The branch main has been updated by sjg: URL: https://cgit.FreeBSD.org/src/commit/?id=c9f4001f81c4d5778f70f77dc9892d1c4ecfdcdb commit c9f4001f81c4d5778f70f77dc9892d1c4ecfdcdb Merge: b5a1f0406b9d 3c2ab5fddc57 Author: Simon J. Gerraty AuthorDate: 2024-05-14 05:17:23 +0000 Commit: Simon J. Gerraty CommitDate: 2024-05-14 05:19:20 +0000 Merge bmake-20240508 Merge commit '3c2ab5fddc576e58f3ffa70dc5fa95144646a513' contrib/bmake/ChangeLog | 8 ++++++++ contrib/bmake/VERSION | 2 +- contrib/bmake/job.c | 7 ++++--- contrib/bmake/main.c | 6 +++--- contrib/bmake/make.h | 5 +++-- contrib/bmake/mk/ChangeLog | 7 +++++++ contrib/bmake/mk/dirdeps.mk | 7 +++++-- contrib/bmake/mk/install-mk | 4 ++-- contrib/bmake/unit-tests/opt-debug-graph1.exp | 2 +- contrib/bmake/unit-tests/opt-debug-graph2.exp | 2 +- contrib/bmake/unit-tests/opt-debug-graph3.exp | 2 +- contrib/bmake/unit-tests/suff-main-several.exp | 2 +- contrib/bmake/unit-tests/suff-transform-debug.exp | 2 +- contrib/bmake/unit-tests/varname-dot-makeoverrides.exp | 6 +++--- contrib/bmake/unit-tests/varname-dot-makeoverrides.mk | 4 ++-- contrib/bmake/var.c | 17 +++++++---------- usr.bin/bmake/Makefile.config | 2 +- 17 files changed, 51 insertions(+), 34 deletions(-) diff --cc contrib/bmake/mk/install-mk index 97874ac49016,c2962ffee6dc..c2962ffee6dc mode 100755,100644..100644 --- a/contrib/bmake/mk/install-mk +++ b/contrib/bmake/mk/install-mk diff --cc usr.bin/bmake/Makefile.config index ee717d952846,000000000000..55bc4a4370ca mode 100644,000000..100644 --- a/usr.bin/bmake/Makefile.config +++ b/usr.bin/bmake/Makefile.config @@@ -1,28 -1,0 +1,28 @@@ +# This is a generated file, do NOT edit! +# See contrib/bmake/bsd.after-import.mk +# + +SRCTOP?= ${.CURDIR:H:H} + +# things set by configure + - _MAKE_VERSION?=20240430 ++_MAKE_VERSION?=20240508 + +prefix?= /usr +srcdir= ${SRCTOP}/contrib/bmake +CC?= cc +MAKE_OS?= +DEFAULT_SYS_PATH?= .../share/mk:/usr/share/mk + +EGREP = egrep +CPPFLAGS+= +CFLAGS+= ${CPPFLAGS} -DHAVE_CONFIG_H +LDFLAGS+= +LIBOBJS+= ${LIBOBJDIR}stresep$U.o +LDADD+= +USE_META?= yes +USE_FILEMON?= dev +FILEMON_H?= /usr/include/dev/filemon/filemon.h +BMAKE_PATH_MAX?= 1024 +# used if MAXPATHLEN not defined +CPPFLAGS+= -DBMAKE_PATH_MAX=${BMAKE_PATH_MAX}