From nobody Thu Mar 14 05:08:43 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 4TwFlc2yNgz5FBFV; Thu, 14 Mar 2024 05:08:44 +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 4TwFlc0vqWz4jfc; Thu, 14 Mar 2024 05:08:44 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1710392924; 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=/VaDLermJkaJy6pTAWVi24UJLZNM1vOds/UYC/RoRpM=; b=r58SUE/34Z3WPxJ1zId1eqgr1ukSeLU9v/4eYhipe+WCX4FgAYB1fyiDmpiokd6LzZzs4q Hsr7oUq8pos+mBBeHohXWvBLroZTQ/cp9JrR1Kkl91LJ35BmT20rBj3DySMYokIO6CC+39 9XqsRcllBVbhygIMFOFJ0le0rpEHJ1eS8GFfnh6TeguRwoC/hBXlmkdBfjoP6lkmmkch3X HE2g7QhBSaNKAEE4Y9fgOwQeO20/kgbQ7CA65x/oDhwBSjsXVAUwcNENN9M6pUXkqkA03K aYIPKXlEQI1fslNtDE1F1ICpHN3m5XO0NHeDrhW2NciHU+3Kq+KWI955HRAUAg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1710392924; a=rsa-sha256; cv=none; b=bg1tv8oWoOJ76nweFwhZpKPppiibPod1U9OazAqKAsjMSpHDAIpHPvk1KtZFk4THtXvKiL 1uj5U3nu7M3cTo3sLOfgB+guet6HW2jn1oaVDlV56GJPoEEZVxsWZtcaRM7SkjyB0jFuha fbXT+T1S/KrUHY0CQ57XlLayc8Ruy+TUJ+z+VY55qVGZg3jjezCfjPyr1lApamGgAY2dmb ctWH+VR6OmTT+AiViDuwfplrVVmSVF0n8gKEAGSQ3ps4RllM/1zJnPWECEJW5H+w+665yo KZf0nQNydsD949Z5he7X+ZJcwLqAfsJjZXfFs7qHORV0K1Tvzc9seLsmrUi40w== 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=1710392924; 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=/VaDLermJkaJy6pTAWVi24UJLZNM1vOds/UYC/RoRpM=; b=UkEmEKRpgHEbsUj5q6nrpZG5ZXW8OXPWUsJoIA0kHsOZ+vyfO9UHOc5lHCHye0x4onMTK9 j8TvN3tUOb5+pxG1pPLrzYDTZ0V0Wl+JhxLTs4uf9VEAmRNsaFXWbnJqNvImmrKohwt3u5 wGClu/2cEi+ve6NacaoNTB+RXBZEgZG19cd5VobXLKg6wRZtVgLXrHFHL0r1fvEOYw+9lM iQv24R5JM+sV3SqUGNQYRrS1Gjuw0Lax3tEi+hvuQ7kS92leHp91kmuItDE8oWSwdxETpK WGq2FKA9y4LZoB3D6PSq8NzG8O1mFC8NAPWmspcOAED8lLPpoC4f6u9IoK1PMw== 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 4TwFlc0MwQzDty; Thu, 14 Mar 2024 05:08:44 +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 42E58heP070197; Thu, 14 Mar 2024 05:08:43 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 42E58hSk070194; Thu, 14 Mar 2024 05:08:43 GMT (envelope-from git) Date: Thu, 14 Mar 2024 05:08:43 GMT Message-Id: <202403140508.42E58hSk070194@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: 3ff501040ba7 - main - bmake Makefile.config 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: 3ff501040ba79894a3b4ed712d7ae4252590fc84 Auto-Submitted: auto-generated The branch main has been updated by sjg: URL: https://cgit.FreeBSD.org/src/commit/?id=3ff501040ba79894a3b4ed712d7ae4252590fc84 commit 3ff501040ba79894a3b4ed712d7ae4252590fc84 Author: Simon J. Gerraty AuthorDate: 2024-03-14 05:08:29 +0000 Commit: Simon J. Gerraty CommitDate: 2024-03-14 05:08:29 +0000 bmake Makefile.config --- usr.bin/bmake/Makefile | 2 +- usr.bin/bmake/Makefile.config | 2 +- usr.bin/bmake/unit-tests/Makefile | 11 ++++++++++- 3 files changed, 12 insertions(+), 3 deletions(-) diff --git a/usr.bin/bmake/Makefile b/usr.bin/bmake/Makefile index b91394765301..5a0bf44fb0fb 100644 --- a/usr.bin/bmake/Makefile +++ b/usr.bin/bmake/Makefile @@ -11,7 +11,7 @@ CFLAGS+= -I${.CURDIR} CLEANDIRS+= FreeBSD CLEANFILES+= bootstrap -# $Id: Makefile,v 1.125 2023/05/17 00:15:46 sjg Exp $ +# $Id: Makefile,v 1.126 2024/03/10 17:46:44 sjg Exp $ PROG?= ${.CURDIR:T} diff --git a/usr.bin/bmake/Makefile.config b/usr.bin/bmake/Makefile.config index 4062f175f763..88ec643b8a4a 100644 --- a/usr.bin/bmake/Makefile.config +++ b/usr.bin/bmake/Makefile.config @@ -6,7 +6,7 @@ SRCTOP?= ${.CURDIR:H:H} # things set by configure -_MAKE_VERSION?=20240108 +_MAKE_VERSION?=20240309 prefix?= /usr srcdir= ${SRCTOP}/contrib/bmake diff --git a/usr.bin/bmake/unit-tests/Makefile b/usr.bin/bmake/unit-tests/Makefile index cf6c85809b9c..dcec9297828c 100644 --- a/usr.bin/bmake/unit-tests/Makefile +++ b/usr.bin/bmake/unit-tests/Makefile @@ -1,7 +1,7 @@ # This is a generated file, do NOT edit! # See contrib/bmake/bsd.after-import.mk # -# $Id: Makefile,v 1.210 2024/01/08 18:28:08 sjg Exp $ +# $Id: Makefile,v 1.211 2024/03/10 17:46:44 sjg Exp $ # # $NetBSD: Makefile,v 1.342 2024/01/07 02:07:44 sjg Exp $ # @@ -477,6 +477,15 @@ BROKEN_TESTS+= sh-flags BROKEN_TESTS+= varmod-localtime .endif +.if ${.MAKE.OS:NCYGWIN*} == "" +BROKEN_TESTS+= \ + export \ + opt-chdir \ + opt-keep-going-indirect \ + +.endif + + .if ${.MAKE.OS:NDarwin} == "" BROKEN_TESTS+= shell-ksh .endif