From nobody Sat Oct 15 13:36:50 2022 X-Original-To: dev-commits-ports-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 4MqPS30jxQz4fdPf; Sat, 15 Oct 2022 13:36: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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4MqPS30CC1z3dbr; Sat, 15 Oct 2022 13:36:51 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1665841011; 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=O1VACC2XQNpdg6knis6c/Vy6rJgJ+hoh0L6cZVhh9Qg=; b=QXcVF25sAyIvcQiGP0Ar86KJD71crmuoaTcfY9Z0ANKWC2Im8uI0oVLWtouKbEyiTsdCy1 c2jNaLcndTeZ34e10/qnyVzyyBu3EPFI4XmF/K83kswC0EdKHmndhqXzOAWKf+eVN1cgEX lrwBop5IwGf+UDkibP/FsNDdEum85MFTmJZJ5RMjeO7BJ6kiMCswrNT+FYL4kN/lVtjWcr Qwq/6ESdGkNRzTAyLlGNSRV0RVvaerBVNXQKyePu+h6k8+A6M/q000vNrJsxOZDp9mP5vR rfy9cXME4sz5imW4PvWDLkHuuYT56AMJN/uYs7rIBqRxc2PObZi9/89Pyv3IHQ== 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 4MqPS265zzz17f8; Sat, 15 Oct 2022 13:36:50 +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 29FDaoNr049605; Sat, 15 Oct 2022 13:36:50 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 29FDao1a049604; Sat, 15 Oct 2022 13:36:50 GMT (envelope-from git) Date: Sat, 15 Oct 2022 13:36:50 GMT Message-Id: <202210151336.29FDao1a049604@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Christian Weisgerber Subject: git: d8c894889cc7 - main - Mk/bsd.port.mk: Use .MAKE.UID instead of calling id(1) List-Id: Commits to the main branch of the FreeBSD ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-main@freebsd.org X-BeenThere: dev-commits-ports-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: naddy X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: d8c894889cc7055dd347b696b2157a5db401ad20 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1665841011; 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=O1VACC2XQNpdg6knis6c/Vy6rJgJ+hoh0L6cZVhh9Qg=; b=KA1SFGUAjbu5KOLvWN9T5lzlcwdySAUr6g7h+VRCoqPMerco+wesPb/omkX41FFUSoJDx1 lo97M6J+9OZDaoa569mGKBwyAkWRR2NV1/3VP73pcpZN3PN9frcXvViFPbtbRmtXPdnEDt szLjNpORCZJUAnsPZy2Aav7qo8kuf8+aTiDTT0ec3bn7Gq9sjcLKbQOusNVmsvdOr4LUpW ZjaCehSHlhuprpWDOX9J4ZqgHKP9rUcTS7HSvE+Y0C2qifBstlzu4dQ75OOxmeWBV2pXYP qn3xM9fTwGTq4pS7IVlGgSzrCeiwWVClMzzBNxWAWC+r+UICYllVWF8zNJUyyw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1665841011; a=rsa-sha256; cv=none; b=IaKeNGwcmpVtl2IhZPrXc3HO1DrH3mj03gIJHfUG0Fenm4K2guuW731Su3danBetbLvAop S73Z0OZTXRD/WeAcIHVfrHEsKZjUmnStUMHiYEvg+dP6vbfvPwdueJRFx54Sd0D0/QtjAy Mgnm/L4g7wINlBBj5bxZ7ViPRg0LGbOIObIfjCs0u/ZZVBSNN3+hNs6etu0VxwrrILI/wR L9nBAhXW0qPJKrA7H3krM7S9ex9ohbAS6Y07LsPgiRSRElyu0WssQRRwqieRjq8oUrlsDm GgGV2jQ3Ysi4JUwXEjyqqK1PKFCdBDLTSiFJzG9hti7uHbybGPFR5C2xJDdzog== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by naddy: URL: https://cgit.FreeBSD.org/ports/commit/?id=d8c894889cc7055dd347b696b2157a5db401ad20 commit d8c894889cc7055dd347b696b2157a5db401ad20 Author: Christian Weisgerber AuthorDate: 2022-10-15 13:31:37 +0000 Commit: Christian Weisgerber CommitDate: 2022-10-15 13:36:10 +0000 Mk/bsd.port.mk: Use .MAKE.UID instead of calling id(1) Save an invocation of id(1) by using the built-in .MAKE.UID variable instead. Check availability of .MAKE.UID first, since older versions of bmake (12.x) don't have it yet. PR: 266942 Approved by: bapt --- Mk/bsd.port.mk | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/Mk/bsd.port.mk b/Mk/bsd.port.mk index 3071c4e08597..a6543b0e069f 100644 --- a/Mk/bsd.port.mk +++ b/Mk/bsd.port.mk @@ -1423,7 +1423,11 @@ USES+=mysql:${USE_MYSQL} . endif . if !defined(UID) +. if defined(.MAKE.UID) +UID= ${.MAKE.UID} +. else UID!= ${ID} -u +. endif . endif DESTDIRNAME?= DESTDIR