svn commit: r287889 - stable/10/share/mk

Bryan Drewery bdrewery at FreeBSD.org
Thu Sep 17 00:24:51 UTC 2015


Author: bdrewery
Date: Thu Sep 17 00:24:50 2015
New Revision: 287889
URL: https://svnweb.freebsd.org/changeset/base/287889

Log:
  MFC r287436:
  
    Avoid sub-shell for realpath(1) for bmake by using its built-in :tA.

Modified:
  stable/10/share/mk/bsd.port.mk
  stable/10/share/mk/bsd.port.subdir.mk
Directory Properties:
  stable/10/   (props changed)

Modified: stable/10/share/mk/bsd.port.mk
==============================================================================
--- stable/10/share/mk/bsd.port.mk	Thu Sep 17 00:19:27 2015	(r287888)
+++ stable/10/share/mk/bsd.port.mk	Thu Sep 17 00:24:50 2015	(r287889)
@@ -10,8 +10,12 @@ _PORTSDIR=	${.CURDIR}/${RELPATH}
 .endif
 .endfor
 _PORTSDIR?=	/usr/ports
+.if defined(.PARSEDIR)
+PORTSDIR=	${_PORTSDIR:tA}
+.else # fmake doesn't have :tA
 PORTSDIR!=	realpath ${_PORTSDIR}
 .endif
+.endif
 
 BSDPORTMK?=	${PORTSDIR}/Mk/bsd.port.mk
 

Modified: stable/10/share/mk/bsd.port.subdir.mk
==============================================================================
--- stable/10/share/mk/bsd.port.subdir.mk	Thu Sep 17 00:19:27 2015	(r287888)
+++ stable/10/share/mk/bsd.port.subdir.mk	Thu Sep 17 00:24:50 2015	(r287889)
@@ -10,8 +10,12 @@ _PORTSDIR=	${.CURDIR}/${RELPATH}
 .endif
 .endfor
 _PORTSDIR?=	/usr/ports
+.if defined(.PARSEDIR)
+PORTSDIR=	${_PORTSDIR:tA}
+.else # fmake doesn't have :tA
 PORTSDIR!=	realpath ${_PORTSDIR}
 .endif
+.endif
 
 BSDPORTSUBDIRMK?=	${PORTSDIR}/Mk/bsd.port.subdir.mk
 


More information about the svn-src-stable mailing list