Skip site navigation (1)Skip section navigation (2)
Date:      Sat, 15 Oct 2022 13:36:50 GMT
From:      Christian Weisgerber <naddy@FreeBSD.org>
To:        ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org
Subject:   git: d8c894889cc7 - main - Mk/bsd.port.mk: Use .MAKE.UID instead of calling id(1)
Message-ID:  <202210151336.29FDao1a049604@gitrepo.freebsd.org>

next in thread | raw e-mail | index | archive | help
The branch main has been updated by naddy:

URL: https://cgit.FreeBSD.org/ports/commit/?id=d8c894889cc7055dd347b696b2157a5db401ad20

commit d8c894889cc7055dd347b696b2157a5db401ad20
Author:     Christian Weisgerber <naddy@FreeBSD.org>
AuthorDate: 2022-10-15 13:31:37 +0000
Commit:     Christian Weisgerber <naddy@FreeBSD.org>
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



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202210151336.29FDao1a049604>