Skip site navigation (1)Skip section navigation (2)
Date:      Thu, 18 Apr 2024 19:04:02 GMT
From:      Rene Ladan <rene@FreeBSD.org>
To:        ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org
Subject:   git: 01dfb9b5dc65 - main - Mk: unregister expired Go 1.19
Message-ID:  <202404181904.43IJ423T002538@gitrepo.freebsd.org>

next in thread | raw e-mail | index | archive | help
The branch main has been updated by rene:

URL: https://cgit.FreeBSD.org/ports/commit/?id=01dfb9b5dc65cd1db8e319fbaaa1c50ac13853b0

commit 01dfb9b5dc65cd1db8e319fbaaa1c50ac13853b0
Author:     Rene Ladan <rene@FreeBSD.org>
AuthorDate: 2024-04-18 19:03:16 +0000
Commit:     Rene Ladan <rene@FreeBSD.org>
CommitDate: 2024-04-18 19:03:16 +0000

    Mk: unregister expired Go 1.19
    
    Simplify a tautology in USES=go while here.
---
 Mk/Uses/go.mk              | 7 ++-----
 Mk/bsd.default-versions.mk | 2 +-
 2 files changed, 3 insertions(+), 6 deletions(-)

diff --git a/Mk/Uses/go.mk b/Mk/Uses/go.mk
index 1836f8972357..e78dbe33b7a5 100644
--- a/Mk/Uses/go.mk
+++ b/Mk/Uses/go.mk
@@ -60,7 +60,7 @@ _INCLUDE_USES_GO_MK=	yes
 
 # When adding a version, please keep the comment in
 # Mk/bsd.default-versions.mk in sync.
-GO_VALID_VERSIONS=	1.19 1.20 1.21 1.22 1.23-devel
+GO_VALID_VERSIONS=	1.20 1.21 1.22 1.23-devel
 
 # Check arguments sanity
 .  if !empty(go_ARGS:N[1-9].[0-9][0-9]:N*-devel:Nmodules:Nno_targets:Nrun)
@@ -99,11 +99,8 @@ GO_BUILDFLAGS+= -v -trimpath
 .  if !defined(WITH_DEBUG) && empty(GO_BUILDFLAGS:M-ldflags*)
 GO_BUILDFLAGS+=	-ldflags=-s
 .  endif
-GO_TESTFLAGS+=	-v
-.  if ${GO_VERSION} != 1.17
 GO_BUILDFLAGS+=	-buildvcs=false
-GO_TESTFLAGS+=	-buildvcs=false
-.  endif
+GO_TESTFLAGS+=	-v -buildvcs=false
 
 CGO_ENABLED?=	1
 CGO_CFLAGS+=	-I${LOCALBASE}/include
diff --git a/Mk/bsd.default-versions.mk b/Mk/bsd.default-versions.mk
index 3be4aff8c05e..a319b8dd12de 100644
--- a/Mk/bsd.default-versions.mk
+++ b/Mk/bsd.default-versions.mk
@@ -63,7 +63,7 @@ GCC_DEFAULT?=		13
 GHOSTSCRIPT_DEFAULT?=	10
 # Possible values: mesa-libs, mesa-devel
 GL_DEFAULT?=		mesa-libs
-# Possible values: 1.19, 1.20, 1.21, 1.22, 1.23-devel
+# Possible values: 1.20, 1.21, 1.22, 1.23-devel
 GO_DEFAULT?=		1.21
 # Possible values: 1.8, 2.2, 3.0
 GUILE_DEFAULT?=		2.2



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202404181904.43IJ423T002538>