aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBrad Davis <brd@FreeBSD.org>2024-09-19 12:26:24 +0000
committerMathieu Arnold <mat@FreeBSD.org>2024-09-19 12:48:25 +0000
commit067905614d641e8a3fa3af3aa2d02b04a28b7185 (patch)
treeecf7ea7eb72d8b12219e2d60d94de122072ce2af
parentf12462e4a9dac4af314765e4df6ae223d426b65d (diff)
Mk/bsd.sites.mk: don't add GH to MASTER_SITES when USE_GITHUB=nodefault
When using USE_GITHUB=nodefault, we don't need to add GH to MASTER_SITES, as the github urls that are needed will be added later. Adding GH here means we'll add a generic GitHub URL to the fetch list, in the form of github.com/<portname>/<portname>/.../<dist> which will not work. When used with USE_GITLAB the framework will add this bogus URL before the correct gitlab url. It does not prevent the distfile to be fetched from gitlab, but it makes everyone try and fetch from a bogus url before trying the correct url. PR: 279816
-rw-r--r--Mk/bsd.sites.mk2
1 files changed, 1 insertions, 1 deletions
diff --git a/Mk/bsd.sites.mk b/Mk/bsd.sites.mk
index e34fbb846144..5fffe2e64865 100644
--- a/Mk/bsd.sites.mk
+++ b/Mk/bsd.sites.mk
@@ -294,7 +294,7 @@ GH_SUBDIR+= ${GH_TUPLE:C@^([^:]*):([^:]*):([^:]*)((:[^:/]*)?)((/.*)?)@\6\4@:M/*:
MASTER_SITE_GITHUB+= https://codeload.github.com/%SUBDIR%
MASTER_SITE_GITHUB_CLOUD+= https://cloud.github.com/downloads/%SUBDIR%
-. if !defined(MASTER_SITES) || !${MASTER_SITES:MGH} && !${MASTER_SITES:MGHC} && !${USE_GITHUB:Mnodefault}
+. if ( !defined(MASTER_SITES) || !${MASTER_SITES:MGH} && !${MASTER_SITES:MGHC} ) && !${USE_GITHUB:Mnodefault}
MASTER_SITES+= GH
. endif
GH_ACCOUNT_DEFAULT= ${PORTNAME}