From nobody Thu May 05 22:45:36 2022 X-Original-To: dev-commits-ports-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 1720B1AB3C7E; Thu, 5 May 2022 22:45:37 +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 4KvTLT08nvz3vdh; Thu, 5 May 2022 22:45:37 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1651790737; 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=QzQ+NS/zWS5WkTGjVb8FDS72JXP2vnzXYPcEP+S6KHg=; b=mfwDynVsK+EfFGxGgpYDK4JpVHpSzc3JR4MvP249lYguXAafMLz/lh90LqVMbIcoUYLQFI oK/TtEh3ylAd2m0lAitocbUxZhBw7VMLLj3KdJKw7MivMXykZ97v97EzCJGZkiOaQ25hLR AdGqs7nuD/9Lf+Gc8NJyM2MId+LwWwG3Pvkh6ASRvi02WcbAzTn7RGqmbSXPHTnGSH6HV5 4lUx+//wO4ObHdecQReTvvNL0oI7EjNwUTd8cYPuNMsO+eTZtFUnxmNrMfAzW6HR0hsfzr Uh7HTr/kNfhadOk6Kfq6gKZZUKj7FrKciwKG5QH8hsDnx3VomWFDq3Ju/kO4wA== 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 D9121103D7; Thu, 5 May 2022 22:45:36 +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 245MjaO4073728; Thu, 5 May 2022 22:45:36 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 245MjaOE073727; Thu, 5 May 2022 22:45:36 GMT (envelope-from git) Date: Thu, 5 May 2022 22:45:36 GMT Message-Id: <202205052245.245MjaOE073727@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Adriaan de Groot Subject: git: 07ebebf97e7c - main - USES=cmake: be explicit about incompatibilities with ninja List-Id: Commit messages for all branches of the ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-all@freebsd.org X-BeenThere: dev-commits-ports-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: adridg X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 07ebebf97e7cc575bc90b37f5d46097179201285 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1651790737; 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=QzQ+NS/zWS5WkTGjVb8FDS72JXP2vnzXYPcEP+S6KHg=; b=XPnq59lEnFyY9QklWCtU97E0a5wkADLhgvf0LWLoX+GB9NAfnKznE11wME3F8gnxsHOowo XvFZdZdKLkUlBb9sOkKQFJ1zbmZhmiY8NeSF9UDtcr3dMNYZM/aoTZDeQb/JLY9IF07i8a fb+TcPKuA+AnVHxciAdNHgKV9dfkZ635d746JT3Ht43FV+8HgBhGXCo2arEVLSCJyrCf4J Zj7zt3C+9LdKQS7xyU0jhRC7wAgurVOQXpp66qIpiRxnznA3Q/Pc/CvYkZ68BrEHO/evu/ x1cdRlg6L7Qs0sAdeFDawFWjye/2CjtpLrNeWuammRYzChyWT5Kbe6qaiTrmTA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1651790737; a=rsa-sha256; cv=none; b=iWoM4sgMJZst4WUtLyo6oiDEyGIUhz3osTDPAYupoRzU/OMbzTf/e/mPRU++oNKHqqS8KF pnevOtO/iEoSmE+hZnpBR+SxzmlXifMCGkO6KDh3OUqi9iPcAZ3k8Ub94T8e44i5Lr+s/u cwz+hkFasTiaBGTZB+RTRRHOC4+qExnRffJc91evoxTC+L4fDNdKN8b8Q3Xizdw9NKyb5f F1eEivoNI0m5FrPKIfE1V5CaafpFZ5n3++Emigd6mVKOADqZjEvb3i2+6t8flAVidNrrhX vfLNnU6PTWcPWZEtBjC2gl8rQtEiFUZj+Oqor8UrmgsqNSGVcVrKuCvZURUGgg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by adridg: URL: https://cgit.FreeBSD.org/ports/commit/?id=07ebebf97e7cc575bc90b37f5d46097179201285 commit 07ebebf97e7cc575bc90b37f5d46097179201285 Author: Adriaan de Groot AuthorDate: 2022-05-05 22:23:35 +0000 Commit: Adriaan de Groot CommitDate: 2022-05-05 22:45:34 +0000 USES=cmake: be explicit about incompatibilities with ninja Document how `USES=gmake` and `USES=emacs` are incompatible with the default `USES=cmake` behavior of using ninja as generator. Using a naive `USES=cmake emacs` line used to get you a strange ninja error when ${MAKE_ARGS} is passed to it, now there is a meaningful error message beforehand. The linked PR examines ways to make it "just work", but that got bogged down. Do a partial fix so it is easier to track down next time. PR: 251191 --- Mk/Uses/cmake.mk | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/Mk/Uses/cmake.mk b/Mk/Uses/cmake.mk index a4c1edd3f0b2..eeaa2fda20f7 100644 --- a/Mk/Uses/cmake.mk +++ b/Mk/Uses/cmake.mk @@ -127,8 +127,15 @@ TEST_WRKSRC?= ${CONFIGURE_WRKSRC} # as the build.ninja file won't be where ninja expects it. . if empty(cmake_ARGS:Mnoninja) && empty(cmake_ARGS:Mrun) && empty(USES:Mfortran) . if "${CONFIGURE_WRKSRC}" == "${BUILD_WRKSRC}" && "${CONFIGURE_WRKSRC}" == "${INSTALL_WRKSRC}" +# USES=gmake sets MAKE_CMD and ninja.mk does too (it also messes with MAKEFILE and MAKE_CMD). . if ! empty(USES:Mgmake) -BROKEN= USES=gmake is incompatible with cmake's ninja-generator +BROKEN= USES=gmake is incompatible with cmake's ninja-generator (try cmake:noninja) +. endif +# USES=emacs appends EMACS= to MAKE_ARGS, which then get passed to ninja. +# Since ninja doesn't support that kind of variable-setting on the command-line, +# it errors out. +. if ! empty(USES:Memacs) +BROKEN= USES=emacs is incompatible with cmake's ninja-generator (try cmake:noninja) . endif . include "${USESDIR}/ninja.mk" . endif