git: f59f844b65a1 - main - bsd.sites.mk: Avoid bogus dev-warning from makesum
- Go to: [ bottom of page ] [ top of archives ] [ this month ]
Date: Thu, 13 Jul 2023 20:54:49 UTC
The branch main has been updated by zirias:
URL: https://cgit.FreeBSD.org/ports/commit/?id=f59f844b65a1f7ce32ec214879cec0b710172006
commit f59f844b65a1f7ce32ec214879cec0b710172006
Author: Felix Palmen <zirias@FreeBSD.org>
AuthorDate: 2023-07-13 07:15:05 +0000
Commit: Felix Palmen <zirias@FreeBSD.org>
CommitDate: 2023-07-13 20:54:00 +0000
bsd.sites.mk: Avoid bogus dev-warning from makesum
makesum calls make fetch and passes MASTER_SITES, so the dev warning
about it is triggered by the value USE_GITLAB computes. Avoid this by
disabling the warning in make fetch when NO_CHECKSUM and DISABLE_SIZE
are set.
Approved by: portmgr (tcberner, mentor)
Differential Revision: https://reviews.freebsd.org/D41014
---
Mk/bsd.sites.mk | 6 +++++-
1 file changed, 5 insertions(+), 1 deletion(-)
diff --git a/Mk/bsd.sites.mk b/Mk/bsd.sites.mk
index c6bee3798d56..2832c818a751 100644
--- a/Mk/bsd.sites.mk
+++ b/Mk/bsd.sites.mk
@@ -406,8 +406,12 @@ WWW?= https://github.com/${GH_ACCOUNT}/${GH_PROJECT}/
.endif # !defined(IGNORE_MASTER_SITE_GITHUB)
# Keep this before USE_GITLAB
-.if !empty(MASTER_SITES:M*//*/*/*/-/archive/${DISTVERSIONFULL}/)
+# first try to detect when fetch was called by makesum, which passes
+# MASTER_SITES and would cause a bogus warning here.
+.if !(make(fetch) && !empty(NO_CHECKSUM) && !empty(DISABLE_SIZE))
+. if !empty(MASTER_SITES:M*//*/*/*/-/archive/${DISTVERSIONFULL}/)
DEV_WARNING+= "MASTER_SITES contains ${MASTER_SITES:M*//*/*/*/-/archive/${DISTVERSIONFULL}/}, please use USE_GITLAB instead."
+. endif
.endif
.if !defined(IGNORE_MASTER_SITE_GITLAB)