sync/ports
1
0
Fork 0
mirror of https://git.freebsd.org/ports.git synced 2025-04-28 01:26:39 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

Mk/*: unconditionally use .MAKE.UID and .MAKE.GID

Browse source 
Since FreeBSD 12 has been EOLed, the built-in make(1) variables
.MAKE.UID and .MAKE.GID are always available.

PR:		276259
Approved by:	arrowd
This commit is contained in:
Christian Weisgerber 2024-01-11 15:53:35 +01:00
parent 3b727a2dff
commit fe3392ed8d
3 changed files with 3 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
Mk/Uses/uidfix.mk
View file

@ -8,9 +8,7 @@
.if !defined(_INCLUDE_USES_UIDFIX_MK) .if !defined(_INCLUDE_USES_UIDFIX_MK)
_INCLUDE_USES_UIDFIX_MK= yes _INCLUDE_USES_UIDFIX_MK= yes
. if !defined(GID) GID?= ${.MAKE.GID}
GID!= id -g
. endif
. if ${UID} != 0 . if ${UID} != 0
MAKE_ENV+= BINOWN=${UID} SHAREOWN=${UID} CONFOWN=${UID} LIBOWN=${UID} MAKE_ENV+= BINOWN=${UID} SHAREOWN=${UID} CONFOWN=${UID} LIBOWN=${UID}
MAKE_ENV+= BINGRP=${GID} SHAREGRP=${GID} CONFGRP=${GID} LIBGRP=${GID} MAKE_ENV+= BINGRP=${GID} SHAREGRP=${GID} CONFGRP=${GID} LIBGRP=${GID}

8
Mk/bsd.port.mk
View file

@ -1448,13 +1448,7 @@ USES+=mysql:${USE_MYSQL}
.include "${PORTSDIR}/Mk/bsd.wx.mk" .include "${PORTSDIR}/Mk/bsd.wx.mk"
. endif . endif
. if !defined(UID) UID?= ${.MAKE.UID}
. if defined(.MAKE.UID)
UID= ${.MAKE.UID}
. else
UID!= ${ID} -u
. endif
. endif
DESTDIRNAME?= DESTDIR DESTDIRNAME?= DESTDIR

4
Mk/bsd.port.subdir.mk
View file

@ -137,9 +137,7 @@ _JAVA_PORTS_INSTALLED!= ${MAKE} -V _JAVA_PORTS_INSTALLED USE_JAVA=1 -f ${PORTSD
. endif . endif
_EXPORTED_VARS+= _JAVA_PORTS_INSTALLED _EXPORTED_VARS+= _JAVA_PORTS_INSTALLED
. if !defined(UID) UID?= ${.MAKE.UID}
UID!= ${ID} -u
. endif
_EXPORTED_VARS+= UID _EXPORTED_VARS+= UID
.endif .endif