From nobody Thu Jan 02 03:48:02 2025 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 4YNt2p2JSZz5jwS1; Thu, 02 Jan 2025 03:48:02 +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 "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4YNt2p1sGQz4V3P; Thu, 2 Jan 2025 03:48:02 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1735789682; 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=iS6J+MQLOpV0w6ecNRaOO9N6Ky5UVw28bsbplbHujVs=; b=JUGLc9j0lpRici5hU70tZTbvK2EvXhoYyl4z4OZx0yN6AxQ1jmrCNorbWwlHcZoHsX/JV9 qOLACGCVwJo3vVTKZOvlIRjmiwBZoJQ9qbnA7kz77VSPNd7zGm/GOqpAd76SchvjG+miAA h0ADhOPtrbjdl7s72Vl71iraGKMxLjGwZxC/IUmdfmSx/Up1MBNYn3a56EolWVbZ2oXbXk e4YGpGNi4M+BguFaplsRs0Gr54QkQbyBqIzGS0o+HRV42osvsJoWtup4CtjtzrpL4FAHW3 8QZWux4gyf3S4q/n6zGLszWt8jLRtI/XYQmn9u/Q8hBYOiYMQH0zgWwrEszE4g== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1735789682; 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=iS6J+MQLOpV0w6ecNRaOO9N6Ky5UVw28bsbplbHujVs=; b=FzFecT7qyWHmjpHqxoOPOjNcXiAzGfAKhndlGwrvK/Pjic2Yn48TGR87EKxpW7S2OisxGU U+tuLikP7kO9mSefoUDMr7tRMd7VuPC8A6THCdkuzEJSWJGZjoV88avW0jwKBhG+XG8N+9 XMXAX915zkey5uFm0VvYKGs7xJIaAnUEOoa9XNY5lvMxpGV/iy8lirGJbX7D0zw5fEJtSB 0V2veoSnkyCK/jvHh4pv5uJAWge2hyQiZnvlrfvMv/s5SRbBN94ierh+EbC4TQzFEMAvX9 Ivj+Od6OBG4YgyES77TSDGIF28ebqHw+WiVnI5qtZsDSvd2H/j0MOOFI13CjFg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1735789682; a=rsa-sha256; cv=none; b=e8dmdXpHSKtY5j/xpxGPS+2cWT/p8TvOypUb1HAfojnpN+bUCTuZnMJFQC7jy7kj4pO45W D6JNsrqPsSg+pZQTP166zMMjiB0EZOngkTYdKwj53LEd8YvkShRTklygt9msyBI9OgxVUk XcbuY5TmoVO2eyFUdxgjQoUHR3eckKaYLKdg52B9/41cL3jKXtfvnm12zQ217cfCMxrYIa jkc9IGWDOHYZl4JYcqnlJ37j0WqQiCrqIxJqMS1SUC9qTOm+ottjybZUUrnyJR2/77T5md 8qDusFTTFJgZYGu7xOQPcudg5V6eeKMpiA/U/9qBXWkB4o4ahnX8jds21dCkzQ== 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 4YNt2p1SzrzsvR; Thu, 2 Jan 2025 03:48:02 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 5023m2Bh017361; Thu, 2 Jan 2025 03:48:02 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 5023m2MM017358; Thu, 2 Jan 2025 03:48:02 GMT (envelope-from git) Date: Thu, 2 Jan 2025 03:48:02 GMT Message-Id: <202501020348.5023m2MM017358@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: "Jason E. Hale" Subject: git: 7e1cd6f48329 - main - Mk/Uses/ninja.mk: Improve documentation 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: X-BeenThere: dev-commits-ports-all@freebsd.org Sender: owner-dev-commits-ports-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: jhale X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 7e1cd6f48329bdaa6c3ba4deb72bb1002c600b58 Auto-Submitted: auto-generated The branch main has been updated by jhale: URL: https://cgit.FreeBSD.org/ports/commit/?id=7e1cd6f48329bdaa6c3ba4deb72bb1002c600b58 commit 7e1cd6f48329bdaa6c3ba4deb72bb1002c600b58 Author: Jason E. Hale AuthorDate: 2025-01-02 03:47:13 +0000 Commit: Jason E. Hale CommitDate: 2025-01-02 03:47:56 +0000 Mk/Uses/ninja.mk: Improve documentation --- Mk/Uses/ninja.mk | 31 +++++++++++++++---------------- 1 file changed, 15 insertions(+), 16 deletions(-) diff --git a/Mk/Uses/ninja.mk b/Mk/Uses/ninja.mk index 8b71d324bb27..e9581903b172 100644 --- a/Mk/Uses/ninja.mk +++ b/Mk/Uses/ninja.mk @@ -1,13 +1,13 @@ -# Provide support to use Ninja +# Support for the Ninja and Samurai build systems # -# Feature: ninja -# Usage: USES=ninja -# Valid ARGS: build, make (default), run, samurai +# Feature: ninja +# Usage: USES=ninja[:arg] +# Valid ARGS: build, make, run, samurai # -# build add a build dependency on ninja -# make use ninja for the build instead of make, implies "build" -# run add a run dependency on ninja -# samurai use samurai regardless of NINJA_DEFAULT (implies make) +# build add a build dependency on ninja +# make use ninja for the build instead of make; implies "build" (default) +# run add a run dependency on ninja +# samurai use samurai regardless of NINJA_DEFAULT; implies "make" # # MAINTAINER: ports@FreeBSD.org @@ -41,11 +41,10 @@ NINJA_CMD= samu _NINJA_PORT= devel/samurai MAKE_ENV+= SAMUFLAGS="-v -j${MAKE_JOBS_NUMBER}" . if ${ninja_ARGS:Mbuild} && !${BINARY_ALIAS:U:Mninja=*} -# Cmake and Meson have native support for Samurai and detect and -# use it when Ninja is not available in the build environment. The -# alias is needed for other ports which call Ninja directly and do -# not fall back to Samurai. There should be no harm in providing it -# generally. +# CMake and Meson have native support for Samurai and use it in lieu of +# Ninja if not found in the build environment. BINARY_ALIAS is needed +# for other ports that call the ninja binary directly with no fallback +# consideration for samu. BINARY_ALIAS+= ninja=samu . endif . else @@ -61,9 +60,9 @@ MAKE_ENV+= NINJA_STATUS="[%p %s/%t] " . if ${ninja_ARGS:Mmake} . if ${NINJA_DEFAULT} == ninja && !defined(_SAMURAI_FROM_ARGS) -# samu does not support GNU-style args, so we cannot just append -# -v last. samu gets this via SAMUFLAGS above but ninja does not -# support an equivalent environment variable. +# samu does not support GNU-style args, so we cannot simply append `-v` +# to MAKE_ARGS to enable verbosity. This is instead accomplished via +# the SAMUFLAGS environment variable defined above in MAKE_ENV. MAKE_ARGS+= -v . endif CMAKE_ARGS+= -GNinja