From nobody Sun Oct 05 15:14:50 2025 X-Original-To: dev-commits-src-main@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 4cfmCv18KDz6B7MH; Sun, 05 Oct 2025 15:14:51 +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 "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4cfmCv0c6yz47l1; Sun, 05 Oct 2025 15:14:51 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1759677291; 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=PouKPGs4kUo4gN3msLcZeYW8+dRTqTll3RLmZV+XzBE=; b=BJDPV22VG9c3K3g6v5LXSLGS0lH1GOGdpMsCUzJ+RP0c2C2ufPn42JDJlONDdMHF8cO5zM GalIq55dshLCWJjkfXz+Rtyy/dIvJnYLIzdUKnXExk+obf/LZwGZDWNc+yTdu0SDzpcleI /7WZb7uDamErhqoF71dPq6kGVszFrv/v8ASU5GgON2qbIHryTx7NX5uD6MyGcS5FHMA+T7 IpUb9fR/iMR0dhBtCOSsEYcD8/wuWcS9v3FYKUmhgcV9N26YZ7kCGIaOgorMFPsW7NPIae sTiuyKf8PbisVWWtGPSHRccAl+RgJLEihpDZhRMSyCFe6iMGAwEaBYLPDPhrVA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1759677291; 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=PouKPGs4kUo4gN3msLcZeYW8+dRTqTll3RLmZV+XzBE=; b=aQzGIINwLs1li9hp4F5NCMH6Yy3YTfYPylNGUOmAd1fFEHFKUt/CGX6Sy+bCFtVqF2cNUG IyS64xlAMAHYuEczkbW1bMIAh55MPkTLs+gPKO2+lFG6XUShcthXdFEpceM61pVqt9MqAl h6Wb53sPJuHmIEpM5sEjzDtMn0Uiz2o+ilWroigTa55winwb8SMXHVi5qo8N/ey5wwYVM/ buam9MbCWuXXzQjfGWfsaEv/sYyejM2RtnzjIaPmim82znUDPor/h1YMEdWvgmv8zsq/mp HFb0kZOEGnf30xQ/oz9+hWu4Zqcxok+aOXrhj+2/xvCPiabcAjfyY2bZntUuEg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1759677291; a=rsa-sha256; cv=none; b=voU3TkF2n6fTNUKxZNQalCZl8fd8vvl3f71LDQNtD7PYZpOiQkwW2YkvxvbiJxV7i0md/o mxjZr7cczFFwmSi4hqQTiBHgtGQ1W2LiNHSs4/M/HZ9Z1EhwdiBYw0h347r6MUkX5cJUsz V1hrBXcui4dljD7v4FI1ZYUu9ne16oMchNVeW7bYFjbox19JRl5Zg9OmuK0qHeEo9e2Ayo dGRH0F3CkgudoSaOGAkraDQJXDA43EGyWLivSSqgytrgNZCEpp9BAm4MkY7sD8q+Oq4Rk6 huYmuss/J/m9vBkmwRWtuZoYKnFeA28lLhFbQIx03sWyQHRrya7cRNYKMUqzbw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none 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 4cfmCt71jyz3HY; Sun, 05 Oct 2025 15:14:50 +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 595FEoDX002787; Sun, 5 Oct 2025 15:14:50 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 595FEoC3002784; Sun, 5 Oct 2025 15:14:50 GMT (envelope-from git) Date: Sun, 5 Oct 2025 15:14:50 GMT Message-Id: <202510051514.595FEoC3002784@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Warner Losh Subject: git: 106951f09fe3 - main - Makefile.inc1: Add back missing if List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: imp X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 106951f09fe39dc693fd7130ab4bc751e1438631 Auto-Submitted: auto-generated The branch main has been updated by imp: URL: https://cgit.FreeBSD.org/src/commit/?id=106951f09fe39dc693fd7130ab4bc751e1438631 commit 106951f09fe39dc693fd7130ab4bc751e1438631 Author: Warner Losh AuthorDate: 2025-10-05 15:11:29 +0000 Commit: Warner Losh CommitDate: 2025-10-05 15:11:29 +0000 Makefile.inc1: Add back missing if The .if defined(_MKSHOWCONFIG) covered an unusually large area, so it should have not been removed in the last commit. I must have tested in the wrong tree before pushing... FixeS: 28b858f5059c Sponsored by: Netflix --- Makefile.inc1 | 3 +++ 1 file changed, 3 insertions(+) diff --git a/Makefile.inc1 b/Makefile.inc1 index e508ffa88d4b..6ace6a6b5eaf 100644 --- a/Makefile.inc1 +++ b/Makefile.inc1 @@ -522,6 +522,8 @@ BUILDENV_SHELL?=${SHELL} BUILDENV_SHELL?=/bin/sh .endif +.if !defined(_MKSHOWCONFIG) + .if !defined(GIT_CMD) || empty(GIT_CMD) . for _P in /usr/bin /usr/local/bin . if exists(${_P}/git) @@ -582,6 +584,7 @@ EXTRA_REVISION= p${_BRANCH:C/.*-p([0-9]+$)/\1/} .if !defined(PKG_VERSION) PKG_VERSION:= ${_PKG_REVISION}${EXTRA_REVISION:C/[[:space:]]//g} .endif + .endif # !defined(_MKSHOWCONFIG) .if make(*package*)