summaryrefslogtreecommitdiff
path: root/Mk/bsd.options.mk
diff options
context:
space:
mode:
authorFelix Palmen <zirias@FreeBSD.org>2022-10-21 09:10:41 +0200
committerFelix Palmen <zirias@FreeBSD.org>2023-07-12 20:55:08 +0200
commit16bde072b16daca1c886116e602c94b5fa99c20f (patch)
treefc40cd4d4d69fccd4e37c29a8574302163a6a0e0 /Mk/bsd.options.mk
parenttextproc/ibus-table: Update 1.17.0 → 1.17.1 (diff)
bsd.sites.mk: Support tag names with USE_GITLAB
Since quite some time, it's possible to download generated tarballs from gitlab for a tag name without knowing the corresponding git hash. This is preferable because you have a single source of truth about the software version. Support this by replacing GL_COMMIT with GL_TAGNAME which also accepts a commit hash, similar to USE_GITHUB. Unfortunately, there's a catch, the DISTFILE must be named exactly: ${GL_PROJECT}-${GL_TAGNAME}.tar.bz2, otherwise it extracts in a directory that contains the commit hash. So, we can't add the gitlab account or the revision suffix to make it work. Therefore, detect whether GL_TAGNAME contains a commit hash, and if it does, use the old behavior of deriving DISTNAME and DISTFILES. Document in CHANGES, also add a DEV_WARNING similar to USE_GITHUB when there's an URL in MASTER_SITES that looks like a gitlab URL. With support for tags, there shouldn't be any reason left to hardcode such an URL in MASTER_SITES. PR: 248967 Approved by: portmgr (tcberner, mentor) Differential Revision: https://reviews.freebsd.org/D37077
Diffstat (limited to 'Mk/bsd.options.mk')
-rw-r--r--Mk/bsd.options.mk2
1 files changed, 1 insertions, 1 deletions
diff --git a/Mk/bsd.options.mk b/Mk/bsd.options.mk
index 90af39e1bed5..09656bb0e1e9 100644
--- a/Mk/bsd.options.mk
+++ b/Mk/bsd.options.mk
@@ -184,7 +184,7 @@ _OPTIONS_FLAGS= ALL_TARGET BROKEN CABAL_EXECUTABLES CATEGORIES CFLAGS CONFIGURE_
CONFLICTS CONFLICTS_BUILD CONFLICTS_INSTALL CPPFLAGS CXXFLAGS \
DESKTOP_ENTRIES DISTFILES EXTRA_PATCHES EXTRACT_ONLY \
GH_ACCOUNT GH_PROJECT GH_SUBDIR GH_TAGNAME GH_TUPLE \
- GL_ACCOUNT GL_COMMIT GL_PROJECT GL_SITE GL_SUBDIR GL_TUPLE \
+ GL_ACCOUNT GL_PROJECT GL_SITE GL_SUBDIR GL_TAGNAME GL_TUPLE \
IGNORE INFO INSTALL_TARGET LDFLAGS LIBS MAKE_ARGS MAKE_ENV \
MASTER_SITES PATCHFILES PATCH_SITES PLIST_DIRS PLIST_FILES \
PLIST_SUB PORTDOCS PORTEXAMPLES SUB_FILES SUB_LIST \