Page MenuHomeFreeBSD
Differential D19570

Mk/Uses/go.mk: Remove support for installing Go libs and sources; add initial modules support
ClosedPublic
Actions

Authored by dmgk on Mar 13 2019, 1:48 PM.
Tags
None
Referenced Files
Unknown Object (File)
Fri, Dec 13, 10:21 AM
Unknown Object (File)
Thu, Dec 12, 9:15 PM
Unknown Object (File)
Tue, Dec 3, 5:13 PM
Unknown Object (File)
Nov 24 2024, 8:26 PM
Unknown Object (File)
Nov 22 2024, 3:37 PM
Unknown Object (File)
Nov 19 2024, 7:44 PM
Unknown Object (File)
Nov 17 2024, 10:45 PM
Unknown Object (File)
Nov 17 2024, 10:04 PM
View All Files
Subscribers
0mp
mat
swills
Contributor Reviewers (ports)

Details

Reviewers
jlaffaye
swills
tobik
mat
Group Reviewers
portmgr
O5: Ports Framework
Commits
rP498386: Mk/Uses/go.mk: Remove support for installing Go libs and sources
Summary
  • Remove support for installing compiled Go libs into GO_LIBDIR and source code into GO_SRCDIR [1]
  • Restrict build to only main packages by adding -buildmode=exe to GO_BUILDFLAGS [2]
  • Add modules argument for initial support for building in module-aware mode. Current support is basic and does two things:
    • disables adding post-extract target and avoids creation of GOPATH dir structure (not needed in module mode)
    • disables network access during build by adding -mod=vendor to GO_BUILDFLAGS [3]

Note: this depends on https://reviews.freebsd.org/D19568

[1] https://www.freebsd.org/doc/en/books/porters-handbook/book.html#go-libs
[2] https://golang.org/cmd/go/#hdr-Build_modes
[3] https://golang.org/cmd/go/#hdr-Modules_and_vendoring

Test Plan

exp-run

Diff Detail

Repository
rP FreeBSD ports repository
Lint
Lint Not Applicable
Unit
Tests Not Applicable

Event Timeline

dmgk created this revision.Mar 13 2019, 1:48 PM
Owners added a reviewer: O5: Ports Framework.Mar 13 2019, 1:48 PM
Herald added a reviewer: portmgr. · View Herald TranscriptMar 13 2019, 1:48 PM
Herald added subscribers: Contributor Reviewers (ports), mat. · View Herald Transcript
Harbormaster completed remote builds in B23061: Diff 55016.Mar 13 2019, 1:48 PM
dmgk added a reviewer: jlaffaye.Mar 13 2019, 1:49 PM
jlaffaye accepted this revision.Mar 13 2019, 9:23 PM

LGTM

dmgk removed a reviewer: O5: Ports Framework. dmgk removed 1 blocking reviewer(s): portmgr.Mar 14 2019, 12:25 PM
This revision is now accepted and ready to land.Mar 14 2019, 12:25 PM
Herald added 1 blocking reviewer(s): portmgr. · View Herald TranscriptMar 14 2019, 12:25 PM
This revision now requires review to proceed.Mar 14 2019, 12:25 PM
dmgk edited the summary of this revision. (Show Details)Mar 14 2019, 12:27 PM
swills added a subscriber: swills.Mar 26 2019, 2:41 PM
dmgk updated this revision to Diff 55472.Mar 26 2019, 8:59 PM

Make go.mk work with either GO_PKGNAME/GH_SUBDIR or both.

If both GO_PKGNAME and GH_SUBDIR are set, GO_PKGNAME takes precedence. If
GO_PKGNAME is unset, set it from GH_SUBDIR. Unset GH_SUBDIR and let
post-extract target to setup GOPATH hierarchy.

Owners added a reviewer: O5: Ports Framework.Mar 26 2019, 8:59 PM
Harbormaster completed remote builds in B23312: Diff 55472.Mar 26 2019, 8:59 PM
dmgk added a reviewer: swills.Mar 26 2019, 9:01 PM
0mp added a subscriber: 0mp.Mar 27 2019, 9:10 AM
0mp added inline comments.
Mk/Uses/go.mk
36 ↗(On Diff #55472)

I am not sure, but shouldn't we document how to use this new modules argument somewhere in this file?

95 ↗(On Diff #55472)

Should it be PREFIX instead of LOCALBASE?

dmgk updated this revision to Diff 55489.Mar 27 2019, 12:17 PM

Use PREFIX instead of LOCALBASE in do-install.

Harbormaster completed remote builds in B23322: Diff 55489.Mar 27 2019, 12:17 PM
dmgk marked an inline comment as done.Mar 27 2019, 12:18 PM
dmgk added inline comments.
Mk/Uses/go.mk
95 ↗(On Diff #55472)

It probably should, thanks for noticing.

dmgk marked an inline comment as done.Mar 27 2019, 12:20 PM
dmgk added inline comments.
Mk/Uses/go.mk
36 ↗(On Diff #55472)

I was going to submit an update to the PHB's Go section when/if this gets merged.

dmgk updated this revision to Diff 55635.Mar 30 2019, 10:57 PM
  • Do not undef GH_SUBDIR
  • Put back GO_WRKDIR_BIN and GO_WRKDIR_SRC, they are used by many ports in build and install targets
  • Do not silence build
Harbormaster completed remote builds in B23409: Diff 55635.Mar 30 2019, 10:57 PM
dmgk added a reviewer: tobik.Apr 2 2019, 1:01 PM
dmgk added a comment.EditedApr 2 2019, 1:27 PM

Build failures and fixes with ports r497574:

# poudriere bulk -C -j112a $(find /usr/ports -name Makefile | xargs egrep 'USES=.*\sgo(\W|$)' | sed -E 's|^/usr/ports/([^/]+/[^/]+)/.*$|\1|')

dmgk added a reviewer: mat.Apr 2 2019, 7:45 PM
tobik mentioned this in rP497579: security/go-cve-dictionary: USES=go does not take any arguments.Apr 2 2019, 7:50 PM
tobik mentioned this in rP497580: sysutils/zfs-snap-diff: Simplify and prepare for D19570.Apr 2 2019, 7:56 PM
tobik mentioned this in rP497582: net/nsq: Simplify pkg-plist and prepare for D19570.Apr 2 2019, 8:00 PM
tobik mentioned this in rP497585: security/keybase: Use GO_BUILDFLAGS and prepare for D19570.Apr 2 2019, 8:19 PM
tobik mentioned this in rP497586: net-mgmt/carbonzipper: Simplify pkg-plist and prepare for D19570.Apr 2 2019, 8:22 PM
tobik mentioned this in D19793: Unbreak build with D19570.Apr 2 2019, 8:26 PM
tobik added a comment.Apr 2 2019, 8:31 PM
In D19570#424428, @dg_syrec.org wrote:

Build failures and fixes with ports r497574:

# poudriere bulk -C -j112a $(find /usr/ports -name Makefile | xargs egrep 'USES=.*\sgo(\W|$)' | sed -E 's|^/usr/ports/([^/]+/[^/]+)/.*$|\1|')

I took care of the ones that work with the previous USES=go too (all except for mail/mailhog).

Mk/Uses/go.mk
36 ↗(On Diff #55472)

Since you are going to explain modules in the PHB anyway, I think a comment at the top of this file to explain what it does would still be nice. Similar to what other USES modules do.

dmgk added a comment.Apr 2 2019, 9:29 PM

@tobik Thank you for the commits Tobias. mail/mailhog is unrelated to this review I added by mistake along with other build failures.

dmgk updated this revision to Diff 55756.Apr 2 2019, 9:33 PM

Update file comments: add a short ARGS description; describe how variables work in modules mode; add a note about GO_PKGNAME/GH_SUBDIR relationship.

Harbormaster completed remote builds in B23475: Diff 55756.Apr 2 2019, 9:33 PM
dmgk marked an inline comment as done.Apr 3 2019, 2:28 PM
tobik mentioned this in D19813: Update "Go Libraries" for D19570.Apr 8 2019, 12:53 AM
tobik added a comment.Apr 8 2019, 6:27 AM

This looks ready to me.

Is there anything left to do? @jlaffaye

tobik mentioned this in rD52911: Porter's Handbook: Update "Go Libraries" for D19570.Apr 8 2019, 6:48 AM
jlaffaye accepted this revision.Apr 8 2019, 8:39 AM
This revision was not accepted when it landed; it landed in state Needs Review.Apr 8 2019, 4:46 PM
Closed by commit rP498386: Mk/Uses/go.mk: Remove support for installing Go libs and sources (authored by tobik). · Explain Why
This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

PathSizePackages
head/
Mk/
Uses/
82 linesO5: Ports Framework

Diff 55948

View Options

head/Mk/Uses/go.mk

Loading...