19:03 Rene Ladan (rene) 

Mk: unregister expired Go 1.19

Simplify a tautology in USES=go while here.

    01dfb9b

19:40 Mathieu Arnold (mat) 

Revert "Mk/Uses: Fix feature checks after my previous {WITH,WITHOUT}_*_PORTS
change"

This reverts commit 665b0219e541019b849fd5a1efdf032081dcf610.

    0660146

17:53 Gleb Popov (arrowd) 

Mk/Uses: Fix feature checks after my previous {WITH,WITHOUT}_*_PORTS change

Test Plan:
Take cmake.mk for example. Choosing a port with USES=cmake and running
`make -V CMAKE_BUILD_TYPE` gives "Release" and
`make -V CMAKE_BUILD_TYPE WITH_DEBUG=yes` gives "Debug". However,
`make -V CMAKE_BUILD_TYPE WITH_DEBUG_PORTS=this/port` still gives "Release"
unless this change is applied.

Differential Revision: https://reviews.freebsd.org/D44748

Fixes:	d697653cffd19ddaf3cdee2589a830c72ab39777

Approved by:	bapt

    665b021

14:45 Tijl Coosemans (tijl) 

Uses/go.mk: Support proxy servers

Pass on Go proxy server environment variables during make fetch.

Reported by:	Кирилл Варнаков <kirill@varnakov.com>
Fixes:		572f23616926 Mk/*: Build with a clean environment

    73ce9db

20:21 Tijl Coosemans (tijl) 

Mk/*: Build with a clean environment

Both our make and gmake use the MAKEFLAGS environment variable but the
values aren't compatible and the latest version of gmake complains about
that.  To rule out that any environment variable can cause problems like
this, add a new command SETENVI=/usr/bin/env -i that clears the
environment, and use it to run upstream build systems with a clean
environment.

Introduce a new variable WRK_ENV that contains the environment to use
with SETENVI in all targets that run upstream build commands.  Variables
that are common between CONFIGURE_ENV and MAKE_ENV could be moved to
WRK_ENV but for now it just contains a minimal environment:

HOME=${WRKDIR}: Fixes USES=elixir ports that were using the user's HOME.
OSVERSION: For cross building; determines the output of uname -K and
getosreldate(3); affects net/freebsd-telnetd for example.
PATH: Fixes USES=gem ports that were using the user's PATH.
PWD=$${PWD}: Preserve current working directory; affects USES=go ports.
TERM: To preserve colored output to terminals.
TMPDIR: For users who define that.
UNAME_*: For cross building; determines the output of uname(1); affects
lang/python* for example.

This commit deals with everything under Mk/.  Ports that have their own
targets running upstream build commands can switch to SETENVI later.

The ports tree adds its definition of ARCH to the MAKEFLAGS environment
variable, which is interpreted by sub-makes as command line arguments,
which means that any definition of ARCH in upstream makefiles was
overridden.  The following ports required fixes now that this is no
longer the case.

games/iortcw, games/q3cellshading, games/tremulous:
These use Quake 3 engine code.  Fix use of ARCH.  Reduce diff between
FreeBSD code and Linux code.

games/legesmotus:
Remove ARCH related patches.

lang/ocaml:
Patch configure script so it detects amd64 correctly.  Also make the
powerpc case consistent with the other architectures.  This also affects
other ocaml ports like devel/ocaml-ocamlbuild and math/ocaml-num that
include a Makefile.config installed by lang/ocaml.  While here, use
SETENVI in check-test target.

net/libnatpmp:
Use of upstream definition of ARCH triggers installation in PREFIX/lib64
on amd64.  Disable this.

PR:		276478
Approved by:	portmgr (antoine)
Exp-run by:	antoine

    572f236

21:08 Ashish SHUKLA (ashish) 

lang/go122: New port: Go release, version 1.22

- Update Mk/* for Go 1.22

PR:		277091

    6277275

18:51 Jason E. Hale (jhale) 

Mk/Uses/go.mk: Fix indentations

[pre-commit] ERROR: go.mk is not properly indented -- please use
/tmp/check_indentations-go.mk.KpLlFV8WBv/go.mk which was created using
Tools/scripts/indent_make_if.pl

Reported by:	'check_mk_indentations' pre-commit hook

    f12e09a

11:39 Dmitri Goutnik (dmgk) 

Mk/Uses/go.mk: Add go1.21 and go1.22-devel

    ade4a023b

15:22 Dmitri Goutnik (dmgk) 

lang/go118: Remove outdated port

go118 is unsupported by upstream since 2023-02-14.

    fedeb22

16:53 Dmitri Goutnik (dmgk) 

Mk/Uses/go.mk: Respect MAKE_JOBS_NUMBER

Limit GOMAXPROCS to MAKE_JOBS_NUMBER during build.

Reported by:	fuz

    04adf67

13:47 Dmitri Goutnik (dmgk) 

Mk/Uses/go.mk: Add go1.20 and go1.21-devel

    7b8262c

11:20 Dmitri Goutnik (dmgk)  Author: Boris Lytochkin

Mk/Uses/go.mk: Use WRKDIR as GOTMPDIR

TMPDIR could be noexec or have low quota, use WRKDIR for Go build artefacts.

Reviewed by:		dmgk
Differential revision:	https://reviews.freebsd.org/D37567

    8cf4554

22:34 Gleb Smirnoff (glebius) 

go.mk: enable PIE build for amd64 only

So far it has been tested for amd64 only and is known to fail
to build at least for arm64.

Approved by:	bapt

    85afc19

12:26 Baptiste Daroussin (bapt) 

go.mk: make sure elf generated by go respects the PIE feature

Reported by:	dmgk

    c8406c3

08:22 Baptiste Daroussin (bapt)  Author: Jatin Kataria

features: Add support to build ports as PIE executables.

This will allow utilization of ASLR provided by the kernel.

Sponsored by:	Netflix

    c6e7c89

13:11 Dmitri Goutnik (dmgk) 

Mk/Uses/go.mk: Pass MAKE_ENV to `go mod tidy` and `go mod vendor`

With go1.19, these subsommands need to know GOCACHE location, which is
derived from XDG_CACHE_HOME. Missing XDG_CACHE_HOME breaks poudriere
user build of Go ports.

PR:		265613
Reported by:	otis, ohauer

    998a548

21:35 Dmitri Goutnik (dmgk) 

Mk/Uses/go.mk: Fix go-post-extract for legacy mode builds

USES=go may set Go version for legacy (pre-module) builds too.

    b425222

18:19 Dmitri Goutnik (dmgk) 

Mk/Uses/go.mk: Update GO_VALID_VERSIONS

1.17 is out, 1.19 and 1.20-devel are in.

    9989731

18:04 Dmitri Goutnik (dmgk) 

Mk/Uses/go.mk: Add GOAMD64 to the GO_ENV

This passes GOAMD64 to the build and test targets.

    42fd268

23:12 Dmitri Goutnik (dmgk) 

Mk/Uses/go.mk: Do not append to EXTRACT_ONLY

Appending to EXTRACT_ONLY may re-add files that were already excluded by
the port. Instead, set EXTRACT_ONLY only if it was not already defined
and let the port handle it otherwise.

    ba923ff

18:27 Dmitri Goutnik (dmgk) 

*/*: Pass lang/go* and Mk/Uses/go.mk maintainership

Pass maintainership to the new Go team.

Approved by:	ygy (maintainer, by email)

    a3ead31

18:19 Dmitri Goutnik (dmgk) 

*/*: Introduce versioned Go ports

- Mk/Uses/go.mk: add support for selecting Go port version in USES=go;
- Mk/bsd.default-versions.mk: add GO_DEFAULT;
- convert lang/go-devel to the master and lang/go{117,118} to slave
  ports;
- add lang/go meta-port that provides go and gofmt symlinks to the
  current default version.

PR:		264336
Reviewed by:	ygy jwb yuri mikael drtr0jan@yandex.ru decke mat
Differential Revision:	https://reviews.freebsd.org/D35346

    3012ca2

18:38 Dmitri Goutnik (dmgk) 

Mk/Uses/go.mk: Block modules download when CLEAN_FETCH_ENV is defined

Additionally, stop overriding post-fetch and post-extract targets.

PR:		258474
Differential Revision:	https://reviews.freebsd.org/D35145

    d71b4ca

11:15 Dmitri Goutnik (dmgk) 

Mk/Uses/go.mk: Try to tidy up go.sum after fetch, fix EXTRACT_ONLY

Make a best effort attempt (without network access) to add missing
go.sum entries using local module cache prepared by the fetch stage.

Set EXTRACT_ONLY dynamically from DISTFILES, repair
USE_{GITHUB,GITLAB}.

PR:		258210
PR:		262981
PR:		263866

    6e236e1

18:43 Dmitri Goutnik (dmgk) 

Mk/Uses/go.mk: Revert part of 4e2913317

Revert module cache revalidation in post-fetch (`go mod verify`), it
breaks non-root poudriere builds.

`go mod verify` needs read/write access to the GOMODCACHE and because
extract stage runs fetch stage again but under a restricted user, `go
mod verify` fails with a "permission denied" error.

    ef7fee4

11:37 Dmitri Goutnik (dmgk) 

Mk/Uses/go.mk: Omit version control information

Disable embedding of version control information [1] in binaries built
by go1.18 and later.

[1] https://tip.golang.org/doc/go1.18#go-version

PR:		263390

    f26bf85

11:39 Dmitri Goutnik (dmgk) 

Mk/Uses/go.mk: Be more lenient about vendoring

Add flag to `go mod vendor` instructing it to proceed despite errors
encountered while loading packages. This will allow build to continue
(with warnings) when e.g. upstream ships outdated go.sum with missing
checksums for some packages. Invalid checksums are still security
errors [1].

While here, add additional module cache revalidation after fetching
dependencies.

[1] https://go.dev/ref/mod#authenticating

    4e29133

12:30 Dmitri Goutnik (dmgk) 

Mk/Uses/go.mk: Do not insist on always pulling go.mod and distfile from GOPROXY

Some Go packages are not listed on pkg.go.dev (usually because their
versioning scheme does not satisfy Go requirements) and, as a
consequence, are not accessible through proxy.golang.org.

Instead of resorting to hacks with pseudo-versions and/or enumerating
dependencies manually with modules2tuple, support fetching go.mod and
distfile from the usual places using DISTFILES mechanism. This will
allow bypassing GOPROXY for go.mod and the distribution archive, but
will still use it for fetching dependencies (with GO_MODULE).

    d592a0f

10:00 Tobias C. Berner (tcberner) 

framework: cleanup conditional-indentations in Mk/

Run Tools/scripts/indent_make_if.pl on all of Mk.

These white space changes contribute greatly to the readability of those files.
As we have a version control system, finding out the reasons for the changes
prior to these white space changes is still easily possible

Differential Revision:	https://reviews.freebsd.org/D35024
Reviewed by:		portmgr (rene, bapt)

    aa25396

19:51 Po-Chuan Hsieh (sunpoet) 

Mk/Uses/go.mk: Fix typo

    43ab76a

01:26 Guangyuan Yang (ygy) 

Mk/Uses/go.mk: fix gomod-clean target when lang/go is not installed

make distclean target will break when lang/go is not installed. This
provides an informational feedback and skips the gomod-clean target if
go executable is not available.

PR:		258359
MFH:		2021Q4
Submitted by:	Rin Morningstar <ports.maintainer@evilphi.com>
Reviewed by:	dmgk
Differential Revision:	https://reviews.freebsd.org/D32054

    f76516f

15:57 Dmitri Goutnik (dmgk) 

Mk/Uses/go.mk: Resign maintainership

    e90c512

16:00 Dmitri Goutnik (dmgk)  Author: Serhii (Sergey) Kozlov

Mk/Uses/go.mk: Add -trimpath to GO_BUILDFLAGS

Differential Revision:	https://reviews.freebsd.org/D30321

    475a23a

21:19 Yuri Victorovich (yuri) 

Mk/Uses/go.mk: Allow ports to have additional distfiles

Some ports need to perform extra build steps for which they need additional
distfiles.

This commit makes go.mk to preserve MASTER_SITES,DISTFILES,EXTRACT_ONLY set by
port's Makefile.

PR:		255085
Approved by:	dmgk (maintainer)

    b77a05b

14:27 Mathieu Arnold (mat) 

framework: Remove $FreeBSD$

Where appropriate fiddle with a few other things.

    5d33e04

22:39 dmgk 

Mk/Uses/go.mk: Escape module names

Escape module names according to the GOPROXY protocol [1].

"To avoid ambiguity when serving from case-insensitive file systems,
the $module and $version elements are case-encoded by replacing every
uppercase letter with an exclamation mark followed by the corresponding
lower-case letter."

[1] https://golang.org/ref/mod#module-proxy

Reported by:	yuri

 

19:17 dmgk 

Mk/Uses/go.mk: Disable network access in extract and test targets.

Reported by:	Andrew Gierth <andrew at tao11.riddles.org.uk>

 

23:30 dmgk 

Mk/Uses/go.mk: Work around symlink creation issue in Poudriere

PR:		253713
Reported by:	Dries Michiels <driesm.michiels@gmail.com>
Reviewed by:	otis

 

13:12 dmgk 

Mk/Uses/go.mk: Add support for using Go for dependency management

Add support for offloading dependency management to Go using `go mod download`.

Reviewed by:	swills
Differential Revision:	https://reviews.freebsd.org/D28184

 

14:21 dmgk 

Mk/Uses/go.mk: Explicitly set modules-aware mode depending on "modules" argument

Until now, go.mk relied on default Go behavior of switching to modules-aware
mode only in the presence of go.mod and building in legacy ("GOPATH") mode
otherwise. This changes with go1.16 [1] which flips defaults to always build in
modules-aware mode and needs an explicit GO111MODULE=off to turn modules off.

Stop relying on Go defaults and set build mode explicitly depending on
"modules" argument in USES=go.

[1] https://github.com/golang/go/issues/41330

 

08:15 dch 

Ensure go modules cannot fetch missing modules via network

Notes from go help modules:

If GOPROXY is set to the string "direct", downloads use a direct connection to
source control servers. Setting GOPROXY to "off" disallows downloading modules
from any source. Otherwise, GOPROXY is expected to be list of module proxy URLs
separated by either comma (,) or pipe (|) characters, which control error
fallback behavior. For each request, the go command tries each proxy in
sequence. If there is an error, the go command will try the next proxy in the
list if the error is a 404 or 410 HTTP response or if the current proxy is
followed by a pipe character, indicating it is safe to fall back on any error.

The GOPRIVATE and GONOPROXY environment variables allow bypassing
the proxy for selected modules. See 'go help module-private' for details.

No matter the source of the modules, the go command checks downloads against
known checksums, to detect unexpected changes in the content of any specific
module version from one day to the next. This check first consults the current
module's go.sum file but falls back to the Go checksum database, controlled by
the GOSUMDB and GONOSUMDB environment variables. See 'go help module-auth'
for details.

Reviewed by:	dmgk
Sponsored by:	SkunkWerks, GmbH
Differential Revision:	https://reviews.freebsd.org/D26860

 

12:52 dmgk 

Mk/Uses/go.mk: Fix gomod-vendor-diff when there are 3 or fewer items in the
GH_TUPLE

'make gomod-vendor-diff' currently doesn't work properly when modules2tuple
doesn't return the first empty line, when 3 or fewer items are in the GH_TUPLE
list.

PR:		245617
Submitted by:	yuri

 

17:39 dmgk 

Mk/Uses/go.mk: Set GO_NO_VENDOR_CHECKS=1

Set GO_NO_VENDOR_CHECKS=1 to signal lang/go to relax vendor checks during ports
build.

PR:		244783
Reported by:	Christopher Hall <hsw@bitmark.com>
Reviewed by:	mikael swills yuri
MFH:		2020Q2
Differential Revision:	https://reviews.freebsd.org/D24122

 

13:30 dmgk 

Mk/Uses/go.mk: Add the gomod-vendor-diff target

Add the 'gomod-vendor-diff' target that tells the user what changes are needed
in GH_TUPLE. This is in addition to the existing 'gomod-vendor' target that
shows the user the whole new GH_TUPLE.

PR:		244660
Submitted by:	yuri

 

13:58 dmgk 

Mk/Uses/go.mk: Avoid pollution of Go module cache with modules downloaded by
gomod-vendor

Use module cache local to the WRKDIR and add the -modcacherw flag (available in
go1.14 [1, 2]) to instruct go mod vendor to leave directories in the module
cache read-write instead of making them unwritable.

[1] https://github.com/golang/go/issues/31481
[2] https://go-review.googlesource.com/c/go/+/202079/

Reviewed by:	swills
Differential Revision:	https://reviews.freebsd.org/D23063

 

13:47 dmgk 

Mk/Uses/go.mk: Revert r517706, switch GO_PORT to lang/go on aarch64

aarch64 support has landed in lang/go, switch default GO_PORT from
lang/go-devel to lang/go.

 

12:15 dmgk 

Mk/Uses/go.mk: Add GO_TESTTARGET and provide default do-test

Add GO_TESTTARGET defaulting to `./...` (the current package and all
subpackages) and create do-test target unless already provided by port's
Makefile.

Also, while here

- remove GO_WRKDIR_SRC - it is not used by any port anymore
- sync GO_PKGNAME and GO_TARGET descriptions with Porter's Handbook

Reviewed by:	tobik
Differential Revision:	https://reviews.freebsd.org/D22412

 

18:10 dmgk 

Mk/Uses/go.mk: Warn if Go is not installed for gomod-vendor

PR:		242872
Reviewed by:	yuri
Differential Revision:	https://reviews.freebsd.org/D22923

 

11:16 antoine 

Revert r517831, FOO_TEST_TARGET is reserved for option helpers

With hat:	portmgr

 

16:19 dmgk 

Mk/Uses/go.mk: Add GO_TEST_TARGET and provide default do-test

Add GO_TEST_TARGET defaulting to `./...` (the current package and all
subpackages) and create do-test target unless already provided by port's
Makefile.

In many cases this would allow us to remove explicit do-test and rely on
defaults provided by ports framework for testing.

Also, while here

- remove GO_WRKDIR_SRC - it is not used anywhere anymore
- sync GO_PKGNAME and GO_TARGET descriptions with Porter's Handbook

Reviewed by:	tobik
Approved by:	tz (mentor, implicit)
Differential Revision:	https://reviews.freebsd.org/D22412

 

12:39 dmgk 

Mk/Uses/go.mk: Omit symbol table and debug information by default

PR:		233335
Reported by:	yuri
Reviewed by:	0mp, tobik
Approved by:	araujo (mentor)
Differential Revision:	https://reviews.freebsd.org/D21730

 

22:47 dmgk 

Mk/Uses/go.mk: Enable binary package building for Go ports on aarch64

Tentatively enable package building for Go ports on aarch64 to catch
regressions early.

Reviewed by:	tobik, Mikael Urankar <mikael.urankar@gmail.com>
Approved by:	tz (mentor, implicit)
Differential Revision:	https://reviews.freebsd.org/D22385

 

20:55 dmgk 

Change my maintainer email

Approved by:	tz (mentor), portmgr (adamw)
Differential Revision:	https://reviews.freebsd.org/D21677

 

08:20 tobik 

Mk/Uses/go.mk: Allow naming output executable in GO_TARGET

- Allow GO_TARGET to be specified as a tuple in the form package:output
- Rework build/install targets

PR:		240535
Submitted by:	Dmitri Goutnik <dg@syrec.org>
Exp-run by:	antoine
Differential Revision:	https://reviews.freebsd.org/D21562

 

17:23 tobik 

Mk/Uses/go.mk: Add gomod-vendor helper target

For USES=go:modules ports it simplifies generating GH_TUPLE by
calling modules2tuple in the right directory etc.

Submitted by:	Dmitri Goutnik <dg@syrec.org> (maintainer)
Differential Revision:	https://reviews.freebsd.org/D21246

 

06:25 tobik 

Mk/Uses/go.mk: Drop PLIST_SUB for GO_PKGNAME

GO_PKGNAME defaults to ${PORTNAME}.  As a result it is often too
general and can produce bad results with make makeplist.  For
example, in mail/aerc it produces bogus entries like

man/man5/%%GO_PKGNAME%%-sendmail.5.gz

since GO_PKGNAME=aerc there.

Having it in PLIST_SUB was only useful for Go libraries which we
no longer support.  Only 2 ports use it currently but do not really
need to and are easily fixed.

Approved by:	dg@syrec.org (maintainer)
Differential Revision:	https://reviews.freebsd.org/D21114

 

07:15 tobik 

Mk/Uses/go.mk: Default to "." instead of PORTNAME

If neither GO_PKGNAME or GO_TARGET are set explicitly, go install
tries to install a package named ${PORTNAME} which is almost always
wrong.  This forces Go ports to set GO_PKGNAME or GO_TARGET although
their value is often redundant.

Update do-build to default to the "." package instead ("the package
in the current directory") and teach do-install to install the "."
package.  In many cases, this removes the need to explicitly set
GO_PKGNAME and GO_TARGET making USES=go:modules alone sufficient
for simpler ports.

This is a backward compatible change.

- Assign maintainership to Dmitri

Submitted by:	Dmitri Goutnik <dg@syrec.org>
Approved by:	jlaffaye (maintainer timeout, ~3 weeks)
Differential Revision:	https://reviews.freebsd.org/D20813

 

03:51 tobik 

Convert all Go ports to USES=go

This allows for port testing with lang/go-devel via GO_PORT, setting
up the Go build environment in a single place, and is step one in
simplifying Go ports that often define too complicated do-build
targets themselves.

USES=go gains new arguments 'run' to add lang/go to RUN_DEPENDS and
'no_targets' for ports with composite builds that call 'go' themselves
and do not need the do-build/do-install targets of USES=go.

PR:		238849
Submitted by:	dg@syrec.org (also D20745)
Reviewed by:	mat, tobik
Exp-run by:	antoine
Differential Revision:	https://reviews.freebsd.org/D20746

 

11:50 tobik 

Mk/Uses/go.mk: Allow overriding the Go port

This is intended to be used for regression testing of USES=go ports
with lang/go-devel.

Submitted by:	dg@syrec.org
Differential Revision:	https://reviews.freebsd.org/D20570

 

16:25 jlaffaye 

Improve support for ARM in go.mk
- Set GOARM value according to current ARCH
- Set CGO_ENABLED

Submitted by:	Dmitri Goutnik <dg@syrec.org>
Differential Revision:	D19892

 

16:46 tobik 

Mk/Uses/go.mk: Remove support for installing Go libs and sources

All ports that depend on it have been removed in r497504.

- Restrict build to only main packages by adding -buildmode=exe to
  GO_BUILDFLAGS
- Add initial support for building in module-aware mode

PR:		236509
Submitted by:	Dmitri Goutnik <dg@syrec.org>
Reviewed by:	0mp, jlaffaye, tobik
Approved by:	jlaffaye (maintainer)
Differential Revision:	https://reviews.freebsd.org/D19570

 

17:26 jlaffaye 

Add GO_BUILDFLAGS variable to Uses/go.mk

PR:		225812
Submitted by:	David O'Rourke <dor.bsd@xm0.uk>

 

02:24 woodsb02 

Allow USES=go ports to override make targets & include <bsd.port.pre.mk>

Prior to this change, if a port had:
- USES=go.mk,
- .include <bsd.port.pre.mk>, and
- overrode a make target (e.g. post-extract:)

then the following warnings were produced when invoking make on the port:
  make: "/usr/local/poudriere/ports/default/CATEGORY/PORT/Makefile" line XX:
warning: duplicate script for target "post-extract" ignored
  make: "/usr/local/poudriere/ports/default/Mk/Uses/go.mk" line 68: warning:
using previous script for "post-extract" defined here

This change fixes this issue by wrapping the definition of make targets
in a separate once-only !defined wrapper which is blocked until post.mk.
This concept was copied from Mk/Uses/python.mk.

PR:		224948
Submitted by:	woodsb02
Approved by:	jlaffaye (maintainer)

 

12:40 mat 

Move lang/go/files/bsd.go.mk to USES=go.

Reviewed by:	bapt
Sponsored by:	Absolight
Differential Revision:	https://reviews.freebsd.org/D6057