From nobody Sat May 13 17:48:32 2023 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 4QJY5X4k3tz4BbgF; Sat, 13 May 2023 17:48:32 +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 4QJY5X49wxz3NYs; Sat, 13 May 2023 17:48:32 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1684000112; 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=ktwz0ovKn8fYKNRilG4o1+il6vLoN4UUceFxtPH20jY=; b=IdOOTcnzN66t8SfZf5rVpOUtqn4/Yf+TpmTAzFYd5O1qIJTQ9+3MimyiS8/q11lF4g0XIJ FPzybzw19RXrRyt1tGQN5nRKN6KCRngAKPOOs6gist2yoXAr0sLBdIHm0okWOUNH1p5v0U M4Lwtf0LQXcH0HKTWWVZIQHtEBgKgr+SJ7fttgs/Sg/xr7+OaERMOu7PdDVr4irqArqcq6 yqfO1qZHhs5PB5knmBdNNSP5747P3YoYoom3dQG3tlvnu0kX4OjVT93t5/EgI3D+3IJ/Y+ iF8Kp5+lfPeke9aur4Qn/qATP9cufYteHcdmA859ccjVXdBJPt5ssvjyFA4yXQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1684000112; 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=ktwz0ovKn8fYKNRilG4o1+il6vLoN4UUceFxtPH20jY=; b=VvoiuR1FXH9sIwi3v3oSMZLIW5VIDquY/836eLhSL7ECPoDEKkpsVWiLllX/PUuxUy3eXX 1g2Cu9MaU4iqETOy8EyL27iT17rxyC810dYPpC+DpWvOH6dxi0H2ussaTSDu0glxz4gMbf RUSmjbAo6Q0fyk3ONj+f7CEuaULnr4NxsrJOkXi/dlO2ehOu/tKim8MkhEkCtuO6qvWu4n 1JvmZB+ezhKGxqVmavF/Anw50ksW+9Y3zy3jVd72zvO7neXyOnEBKr7t4VO9ehsGmu1PcM 1RM55V/njdzPiIGTsh4MCTfY7jZZ2Sl/UHS7tseKxwDVG/rRJAi7QpefJMswSg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1684000112; a=rsa-sha256; cv=none; b=O89C6BMDQc20R96hkEs47x1qdhbue7ey9mjuSCvwj/YdGEW5Z0WklHau9JPuurMmowUYx7 W6RejvAOMwHTQ7JNZa4HvQ2qyx0tRdecliPUE7SVfPWqehWEdJ2QDxjyjIj/sBs9Pr8413 UZk24/AQ0omW/y5GEw53Lo4YaWBrq6n/m5LmYAZ0mxt5FHMqJK6WzIiM/8q0IbYBnyG41i JiMu70pOhFVZ7NxE4fXRpoqYN8BmTWzE/QlWqnDkMlOKbaHhuTK1pTBycVhVTWApPqCpre lCezY3txaeRyFC6TZZ+LIUchvPEM1rXBI8lZt9d7/aQ/nIKSf2+h+z+qG0RTMQ== 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 4QJY5X3FZvzQhx; Sat, 13 May 2023 17:48:32 +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 34DHmWQY030706; Sat, 13 May 2023 17:48:32 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 34DHmWo9030705; Sat, 13 May 2023 17:48:32 GMT (envelope-from git) Date: Sat, 13 May 2023 17:48:32 GMT Message-Id: <202305131748.34DHmWo9030705@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: 477f6e3c963b - main - sys.dirdeps.mk use ?= for OBJTOP 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: sjg X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 477f6e3c963b472cf513ab8101ac05354301fcf8 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by sjg: URL: https://cgit.FreeBSD.org/src/commit/?id=477f6e3c963b472cf513ab8101ac05354301fcf8 commit 477f6e3c963b472cf513ab8101ac05354301fcf8 Author: Simon J. Gerraty AuthorDate: 2023-05-13 17:46:24 +0000 Commit: Simon J. Gerraty CommitDate: 2023-05-13 17:46:24 +0000 sys.dirdeps.mk use ?= for OBJTOP This broke bmake's after-import step. --- contrib/bmake/mk/sys.dirdeps.mk | 2 +- share/mk/sys.dirdeps.mk | 2 +- usr.bin/bmake/Makefile.config | 2 +- usr.bin/bmake/unit-tests/Makefile | 5 +++-- 4 files changed, 6 insertions(+), 5 deletions(-) diff --git a/contrib/bmake/mk/sys.dirdeps.mk b/contrib/bmake/mk/sys.dirdeps.mk index 845eda181b90..2daf3681d8d0 100644 --- a/contrib/bmake/mk/sys.dirdeps.mk +++ b/contrib/bmake/mk/sys.dirdeps.mk @@ -123,7 +123,7 @@ MACHINE_OBJ.host = ${HOST_TARGET} MACHINE_OBJ.host32 = ${HOST_TARGET32} MACHINE_OBJ.${MACHINE} ?= ${TARGET_OBJ_SPEC} MACHINE_OBJDIR = ${MACHINE_OBJ.${MACHINE}} -OBJTOP = ${OBJROOT}/${MACHINE_OBJDIR} +OBJTOP ?= ${OBJROOT}/${MACHINE_OBJDIR} # we do not use MAKEOBJDIRPREFIX .undef MAKEOBJDIRPREFIX diff --git a/share/mk/sys.dirdeps.mk b/share/mk/sys.dirdeps.mk index 845eda181b90..2daf3681d8d0 100644 --- a/share/mk/sys.dirdeps.mk +++ b/share/mk/sys.dirdeps.mk @@ -123,7 +123,7 @@ MACHINE_OBJ.host = ${HOST_TARGET} MACHINE_OBJ.host32 = ${HOST_TARGET32} MACHINE_OBJ.${MACHINE} ?= ${TARGET_OBJ_SPEC} MACHINE_OBJDIR = ${MACHINE_OBJ.${MACHINE}} -OBJTOP = ${OBJROOT}/${MACHINE_OBJDIR} +OBJTOP ?= ${OBJROOT}/${MACHINE_OBJDIR} # we do not use MAKEOBJDIRPREFIX .undef MAKEOBJDIRPREFIX diff --git a/usr.bin/bmake/Makefile.config b/usr.bin/bmake/Makefile.config index 60e86b185246..83920a75165b 100644 --- a/usr.bin/bmake/Makefile.config +++ b/usr.bin/bmake/Makefile.config @@ -7,7 +7,7 @@ SRCTOP?= ${.CURDIR:H:H} # things set by configure -_MAKE_VERSION?=20230414 +_MAKE_VERSION?=20230510 prefix?= /usr srcdir= ${SRCTOP}/contrib/bmake diff --git a/usr.bin/bmake/unit-tests/Makefile b/usr.bin/bmake/unit-tests/Makefile index 1db1dcd87718..cacf343d162f 100644 --- a/usr.bin/bmake/unit-tests/Makefile +++ b/usr.bin/bmake/unit-tests/Makefile @@ -2,9 +2,9 @@ # See contrib/bmake/bsd.after-import.mk # # $FreeBSD$ -# $Id: Makefile,v 1.193 2023/02/25 20:03:25 sjg Exp $ +# $Id: Makefile,v 1.195 2023/05/10 18:26:24 sjg Exp $ # -# $NetBSD: Makefile,v 1.333 2023/02/25 19:30:32 sjg Exp $ +# $NetBSD: Makefile,v 1.335 2023/05/10 13:03:06 rillig Exp $ # # Unit tests for make(1) # @@ -378,6 +378,7 @@ TESTS+= varmod-loop-delete TESTS+= varmod-loop-varname TESTS+= varmod-match TESTS+= varmod-match-escape +TESTS+= varmod-mtime TESTS+= varmod-no-match TESTS+= varmod-order TESTS+= varmod-order-numeric