git: 95ae95d413bd - main - pkgbase: limit PKG_VERSION_FROM calculation to real-update-packages

[Kyle Evans]

The branch main has been updated by kevans:

URL: https://cgit.FreeBSD.org/src/commit/?id=95ae95d413bdbab9b7360d190a81c18aadf440f7

commit 95ae95d413bdbab9b7360d190a81c18aadf440f7
Author:     Kyle Evans <kevans at FreeBSD.org>
AuthorDate: 2021-01-18 19:34:54 +0000
Commit:     Kyle Evans <kevans at FreeBSD.org>
CommitDate: 2021-01-18 19:34:54 +0000

    pkgbase: limit PKG_VERSION_FROM calculation to real-update-packages
    
    PKG_ABI is defined in some other targets that do not need to shell out and
    calculate PKG_VERSION_FROM. Moreover, it produces extra errors when
    bootstrapping an initial pkgbase repo, as the /latest link doesn't exist
    yet.
---
 Makefile.inc1 | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Makefile.inc1 b/Makefile.inc1
index f77fe5cfa25c..bb3d2f98f4a3 100644
--- a/Makefile.inc1
+++ b/Makefile.inc1
@@ -1872,7 +1872,7 @@ _pkgbootstrap: .PHONY
 PKG_ABI!=${PKG_CMD} -o ABI_FILE=${WSTAGEDIR}/usr/bin/uname config ABI
 .endif
 
-.if !defined(PKG_VERSION_FROM)
+.if !defined(PKG_VERSION_FROM) && make(real-update-packages)
 .if defined(PKG_ABI)
 PKG_VERSION_FROM!=/usr/bin/readlink ${REPODIR}/${PKG_ABI}/latest
 .endif