From nobody Thu May 23 20:14:19 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 4VlfXL1vBTz5LF8L; Thu, 23 May 2024 20:14:26 +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 4VlfXK71QGz40Rs; Thu, 23 May 2024 20:14:25 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1716495266; 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=FEbRIKjE2LTQ3inizDz7rOcXkH9Z1CqhzILQSlP/+Ro=; b=xYX3plvYu+yofqUCLvUFBt6uUasGzHlIv/EtVhKp7pOXSEBKYy3DbPa9eSbxJgRWrsSsz0 FZgmYXPojGa97MBVP5/CLQ+YlfwxRFj4mHc0z0S6ols0PJfxl0hflMc+nMPr0CjHK9p7vV PLWPQ3sAFh+4V0yuMU6P+9OyhjsA85LTMAF+zL/juiT+7uimHfqXUOPaeId9MQAOhOWP90 uz8HpMqnWpYtI6c36ErpRyv4LYo9ArvI83geh1kOR9AMjwZj5XE53/BJG9fBFfbWyYvfqZ +w248ToxIcbLLLOCLHZZsWKXeEYOTLRlUrFFl/x14e2obRV28OLG1yjlhUgjAA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1716495266; a=rsa-sha256; cv=none; b=TxDlP0eyM0MgLirwBDkYrtMMb2DX2MelVgUqYB9adyDmS1dFYE9uKX4VoXlndx39tL+UGF 3nVj/csEGf0qDneQ9V46UnKHc8rSdygPYETAb9+bGEiFinpw2DnG5LhuH+vhA0LfKZQWN+ YMlv5bfNmN5nsVLWEPmXU3pWba9cFNR4XkWTqDDDgxAEoxeP2LImiJxkaid8Yql4QlRkt4 queLltbCEEFJxE7wixdEYUwltuyWLlAac8QymGRuHJFrkLfl2lIVWxslJ3caf12TJm4f1j lNNkDm2Ty7LGm2vuMDnQ4j+FiRgS4chniq6r86NcQlUxNCqtE1UVm7ufcqeKjw== 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=1716495266; 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=FEbRIKjE2LTQ3inizDz7rOcXkH9Z1CqhzILQSlP/+Ro=; b=ny7ZuTs4GFdVI58IkI3HZ4odn9Zu0HaMfyfnoaAotoQB2z5rDIU0GV9I4A6VMV8zUhozER BhwaNGq+pflGOv31Fttc5mms3Tls87JuQZMw90XESjQGWAk9leI9SsEKYK75b83g1uPxSk q75gRaj4SxwP4juBMRlFW+9kr1ticKeXQwGM4prnGcO6jeT23MjOSCv/uymNZDjjFKFeYL /Q/Ig9m+Zgf1n6dMn2VXOuN0z5aLANIVQ8UUHNGRaIk1DJX2YPBmOjPy9fDui+vs4ReJkz 3AS7PpODRHy6mBe7wiTXlnI16Q5LI6XRV5SDoxMFmDIKtFkC72OhDhCsLZHMfg== 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 4VlfXK6RvWz140Z; Thu, 23 May 2024 20:14:25 +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 44NKEPhU037993; Thu, 23 May 2024 20:14:25 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 44NKEJ1l037976; Thu, 23 May 2024 20:14:19 GMT (envelope-from git) Date: Thu, 23 May 2024 20:14:19 GMT Message-Id: <202405232014.44NKEJ1l037976@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: 9d3df31ec06f - main - Merge bmake-20240520 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: 9d3df31ec06fe91c5c67da464f11408474d57174 Auto-Submitted: auto-generated The branch main has been updated by sjg: URL: https://cgit.FreeBSD.org/src/commit/?id=9d3df31ec06fe91c5c67da464f11408474d57174 commit 9d3df31ec06fe91c5c67da464f11408474d57174 Merge: 2356b60be702 29efb3dcaedd Author: Simon J. Gerraty AuthorDate: 2024-05-23 20:11:02 +0000 Commit: Simon J. Gerraty CommitDate: 2024-05-23 20:12:43 +0000 Merge bmake-20240520 Merge commit '29efb3dcaedd9cbabc6f96f35545baf2c8b28501' contrib/bmake/ChangeLog | 15 +++++++++ contrib/bmake/VERSION | 2 +- contrib/bmake/dir.c | 51 ++++++++++++++++++++++++++----- contrib/bmake/dir.h | 3 +- contrib/bmake/getopt.c | 6 ++-- contrib/bmake/main.c | 6 ++-- contrib/bmake/parse.c | 6 ++-- contrib/bmake/unit-tests/deptgt-phony.exp | 2 +- usr.bin/bmake/Makefile.config | 2 +- 9 files changed, 71 insertions(+), 22 deletions(-) diff --cc usr.bin/bmake/Makefile.config index 55bc4a4370ca,000000000000..e62d207b70ac 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?=20240508 ++_MAKE_VERSION?=20240520 + +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}