From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id C9592138334 for ; Wed, 11 Sep 2019 18:22:46 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 66C9BE09F5; Wed, 11 Sep 2019 18:22:43 +0000 (UTC) Received: from smtp.gentoo.org (mail.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 06777E09ED for ; Wed, 11 Sep 2019 18:22:43 +0000 (UTC) Received: from whubbs1.gaikai.biz (unknown [100.42.103.5]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) (Authenticated sender: williamh) by smtp.gentoo.org (Postfix) with ESMTPSA id EFC5534B0CA; Wed, 11 Sep 2019 18:22:41 +0000 (UTC) Received: (nullmailer pid 19425 invoked by uid 1000); Wed, 11 Sep 2019 18:22:38 -0000 Date: Wed, 11 Sep 2019 13:22:38 -0500 From: William Hubbs To: gentoo-dev@lists.gentoo.org Cc: mgorny@gentoo.org Subject: Re: [gentoo-dev] [PATCH 1/3] go-module.eclass: introduce new eclass to handle go modules Message-ID: <20190911182238.GA19361@whubbs1.dev.av1.gaikai.org> Mail-Followup-To: gentoo-dev@lists.gentoo.org, mgorny@gentoo.org References: <20190911172128.18885-1-williamh@gentoo.org> <20190911172128.18885-2-williamh@gentoo.org> <1839d49b6adcfeba3c807543e0ba01e0f2888a36.camel@gentoo.org> Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-dev@lists.gentoo.org Reply-to: gentoo-dev@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply MIME-Version: 1.0 Content-Type: multipart/signed; micalg=pgp-sha1; protocol="application/pgp-signature"; boundary="Nq2Wo0NMKNjxTN9z" Content-Disposition: inline In-Reply-To: <1839d49b6adcfeba3c807543e0ba01e0f2888a36.camel@gentoo.org> User-Agent: Mutt/1.10.1 (2018-07-13) X-Archives-Salt: 8146f451-d52a-4bf2-8c89-73898695ea20 X-Archives-Hash: c13984fec5dcc52d305572da51987808 --Nq2Wo0NMKNjxTN9z Content-Type: text/plain; charset=utf-8 Content-Disposition: inline Content-Transfer-Encoding: quoted-printable On Wed, Sep 11, 2019 at 07:38:17PM +0200, Micha=C5=82 G=C3=B3rny wrote: > On Wed, 2019-09-11 at 12:21 -0500, William Hubbs wrote: > > Copyright: Sony Interactive Entertainment Inc. > > Signed-off-by: William Hubbs > > --- > > eclass/go-module.eclass | 76 +++++++++++++++++++++++++++++++++++++++++ > > 1 file changed, 76 insertions(+) > > create mode 100644 eclass/go-module.eclass > >=20 > > diff --git a/eclass/go-module.eclass b/eclass/go-module.eclass > > new file mode 100644 > > index 00000000000..7009fcd3beb > > --- /dev/null > > +++ b/eclass/go-module.eclass > > @@ -0,0 +1,76 @@ > > +# Copyright 1999-2015 Gentoo Foundation >=20 > You need to replace your calendar. And copyright holder. Sure, I thought I ffixed that. > > +# Distributed under the terms of the GNU General Public License v2 > > + > > +# @ECLASS: go-module.eclass >=20 > Any reason to change naming from golang-* to go-* now? Well, "lang" is sort of redundant, and there will be only one eclass, so I thought I would make things a bit more simple. >=20 > > +# @MAINTAINER: > > +# William Hubbs > > +# @SUPPORTED_EAPIS: 7 > > +# @BLURB: basic eclass for building software written in the go > > +# programming language that uses go modules. > > +# @DESCRIPTION: > > +# This eclass provides a convenience src_prepare() phase and some basic > > +# settings needed for all software written in the go programming > > +# language that uses go modules. > > +# > > +# You will know the software you are packaging uses modules because > > +# it will have files named go.sum and go.mod in its top-level source > > +# directory. If it does not have these files, use the golang-* eclasse= s. > > +# > > +# If the software you are packaging uses modules, the next question is > > +# whether it has a directory named "vendor" at the top-level of the so= urce tree. > > +# > > +# If it doesn't, you need to create a tarball of what would be in the > > +# vendor directory and mirror it locally. This is done with the > > +# following commands if upstream is using a git repository: > > +# > > +# @CODE: > > +# > > +# $ cd /my/clone/of/upstream > > +# $ git checkout > > +# $ go mod vendor > > +# $ tar cvf project-version-vendor.tar.gz vendor > > +# > > +# @CODE: > > +# > > +# Other than this, all you need to do is inherit this eclass then > > +# make sure the exported src_prepare function is run. > > + > > +case ${EAPI:-0} in > > + 7) ;; > > + *) die "${ECLASS} API in EAPI ${EAPI} not yet established." > > +esac > > + > > +if [[ -z ${_GO_MODULE} ]]; then > > + > > +_GO_MODULE=3D1 > > + > > +BDEPEND=3D">=3Ddev-lang/go-1.12" > > + > > +# Do not download dependencies from the internet > > +# make build output verbose by default > > +export GOFLAGS=3D"-mod=3Dvendor -v -x" > > + > > +# Do not complain about CFLAGS etc since go projects do not use them. > > +QA_FLAGS_IGNORED=3D'.*' > > + > > +# Upstream does not support stripping go packages > > +RESTRICT=3D"strip" > > + > > +EXPORT_FUNCTIONS src_prepare >=20 > Don't you need to inherit some other eclass to make it build? The primary reason for all of the golang-* eclasses was the GOPATH variable, which is not relevant when you are using modules. I can look at adding a src_compile to this eclass, but I haven't thought about what it would contain yet. =20 > > + > > +# @FUNCTION: go-module_src_prepare > > +# @DESCRIPTION: > > +# Run a default src_prepare then move our provided vendor directory to > > +# the appropriate spot if upstream doesn't provide a vendor directory. > > +go-module_src_prepare() { > > + default > > + # Use the upstream provided vendor directory if it exists. > > + [[ -d vendor ]] && return > > + # If we are not providing a mirror of a vendor directory we created > > + # manually, return since there may be nothing to vendor. > > + [[ ! -d ../vendor ]] && return > > + # At this point, we know we are providing a vendor mirror. > > + mv ../vendor . || die "Unable to move ../vendor directory" >=20 > Wouldn't it be much simpler to create appropriate directory structure > in the tarball? Then you wouldn't need a new eclass at all. You would definitely need an eclass (see the settings and dependencies). Take a look at the differences in the spire and hub ebuilds in this series. I'm not sure what you mean by adding the directory structure to the tarball? I guess you could add something to the vendor tarball when you create it. What I tried to avoid was stomping on the vendor directory if it is included upstream. William > > +} > > + > > +fi >=20 > --=20 > Best regards, > Micha=C5=82 G=C3=B3rny >=20 --Nq2Wo0NMKNjxTN9z Content-Type: application/pgp-signature; name="signature.asc" Content-Description: Digital signature -----BEGIN PGP SIGNATURE----- iF0EARECAB0WIQTVeuxEZo4uUHOkQAluVBb0MMRlOAUCXXk7ZgAKCRBuVBb0MMRl OITfAJ9agTMobyXNpRbvlH/lCdgEi/l9ngCglYIyEalHC44vIlwN0roBsvk2ykE= =xTRs -----END PGP SIGNATURE----- --Nq2Wo0NMKNjxTN9z--