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 3BC46138334 for ; Wed, 11 Sep 2019 19:47:15 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 89910E0A96; Wed, 11 Sep 2019 19:47:11 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (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 2C1C7E093D for ; Wed, 11 Sep 2019 19:47:11 +0000 (UTC) Received: from [192.168.1.6] (c134-66.icpnet.pl [85.221.134.66]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) (Authenticated sender: mgorny) by smtp.gentoo.org (Postfix) with ESMTPSA id ACAB634B145; Wed, 11 Sep 2019 19:47:09 +0000 (UTC) Date: Wed, 11 Sep 2019 19:47:04 +0000 User-Agent: K-9 Mail for Android In-Reply-To: <20190911194041.GA19620@whubbs1.dev.av1.gaikai.org> References: <20190911172128.18885-1-williamh@gentoo.org> <20190911172128.18885-2-williamh@gentoo.org> <1839d49b6adcfeba3c807543e0ba01e0f2888a36.camel@gentoo.org> <20190911182238.GA19361@whubbs1.dev.av1.gaikai.org> <20190911194041.GA19620@whubbs1.dev.av1.gaikai.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: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable Subject: Re: [gentoo-dev] [PATCH 1/3] go-module.eclass: introduce new eclass to handle go modules To: gentoo-dev@lists.gentoo.org,William Hubbs From: =?UTF-8?Q?Micha=C5=82_G=C3=B3rny?= Message-ID: X-Archives-Salt: 6fd902f5-a904-4180-9775-7d992d676bb6 X-Archives-Hash: 63c527827d52d4a7379703b86145e288 Dnia September 11, 2019 7:40:41 PM UTC, William Hubbs napisa=C5=82(a): >On Wed, Sep 11, 2019 at 08:31:16PM +0200, Micha=C5=82 G=C3=B3rny wrote: >> On Wed, 2019-09-11 at 13:22 -0500, William Hubbs wrote: >> > On Wed, Sep 11, 2019 at 07:38:17PM +0200, Micha=C5=82 G=C3=B3rny wrot= e: >> > > On Wed, 2019-09-11 at 12:21 -0500, William Hubbs wrote: >> > > > Copyright: Sony Interactive Entertainment Inc=2E >> > > > Signed-off-by: William Hubbs >> > > > --- >> > > > eclass/go-module=2Eeclass | 76 >+++++++++++++++++++++++++++++++++++++++++ >> > > > 1 file changed, 76 insertions(+) >> > > > create mode 100644 eclass/go-module=2Eeclass >> > > >=20 >> > > > diff --git a/eclass/go-module=2Eeclass b/eclass/go-module=2Eeclas= s >> > > > new file mode 100644 >> > > > index 00000000000=2E=2E7009fcd3beb >> > > > --- /dev/null >> > > > +++ b/eclass/go-module=2Eeclass >> > > > @@ -0,0 +1,76 @@ >> > > > +# Copyright 1999-2015 Gentoo Foundation >> > >=20 >> > > You need to replace your calendar=2E And copyright holder=2E >> >=20 >> > Sure, I thought I ffixed that=2E >> >=20 >> > > > +# Distributed under the terms of the GNU General Public >License v2 >> > > > + >> > > > +# @ECLASS: go-module=2Eeclass >> > >=20 >> > > Any reason to change naming from golang-* to go-* now? >> >=20 >> > Well, "lang" is sort of redundant, and there will be only one >eclass, so >> > I thought I would make things a bit more simple=2E >> >=20 >> > > > +# @MAINTAINER: >> > > > +# William Hubbs >> > > > +# @SUPPORTED_EAPIS: 7 >> > > > +# @BLURB: basic eclass for building software written in the go >> > > > +# programming language that uses go modules=2E >> > > > +# @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=2E >> > > > +# >> > > > +# You will know the software you are packaging uses modules >because >> > > > +# it will have files named go=2Esum and go=2Emod in its top-leve= l >source >> > > > +# directory=2E If it does not have these files, use the golang-* >eclasses=2E >> > > > +# >> > > > +# 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 source tree=2E >> > > > +# >> > > > +# If it doesn't, you need to create a tarball of what would be >in the >> > > > +# vendor directory and mirror it locally=2E 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=2Etar=2Egz vendor >> > > > +# >> > > > +# @CODE: >> > > > +# >> > > > +# Other than this, all you need to do is inherit this eclass >then >> > > > +# make sure the exported src_prepare function is run=2E >> > > > + >> > > > +case ${EAPI:-0} in >> > > > + 7) ;; >> > > > + *) die "${ECLASS} API in EAPI ${EAPI} not yet established=2E" >> > > > +esac >> > > > + >> > > > +if [[ -z ${_GO_MODULE} ]]; then >> > > > + >> > > > +_GO_MODULE=3D1 >> > > > + >> > > > +BDEPEND=3D">=3Ddev-lang/go-1=2E12" >> > > > + >> > > > +# 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=2E >> > > > +QA_FLAGS_IGNORED=3D'=2E*' >> > > > + >> > > > +# 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? >> >=20 >> > The primary reason for all of the golang-* eclasses was the GOPATH >> > variable, which is not relevant when you are using modules=2E >> >=20 >> > I can look at adding a src_compile to this eclass, but I haven't >thought >> > about what it would contain yet=2E >> > =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=2E >> > > > +go-module_src_prepare() { >> > > > + default >> > > > + # Use the upstream provided vendor directory if it exists=2E >> > > > + [[ -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=2E >> > > > + [[ ! -d =2E=2E/vendor ]] && return >> > > > + # At this point, we know we are providing a vendor mirror=2E >> > > > + mv =2E=2E/vendor =2E || die "Unable to move =2E=2E/vendor direc= tory" >> > >=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=2E >> >=20 >> > You would definitely need an eclass (see the settings and >dependencies)=2E >> >=20 >> > Take a look at the differences in the spire and hub ebuilds in this >> > series=2E 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=2E >>=20 >> I mean packing it as 'spire-1=2E2=2E3/vendor' or whatever the package >> directory is, so that it extracts correctly instead of making a >tarball >> that needs to be moved afterwards=2E > >That would clobber the upstream provided vendor directory and that's >what I want to avoid with the first test in src_prepare=2E If upstream already includes vendored modules, why would you create your o= wn tarball in the first place? > >>=20 >> >=20 >> > What I tried to avoid was stomping on the vendor directory if it is >> > included upstream=2E >>=20 >> You do that anyway by moving files=2E > >See the first test in src_prepare=2E I go out of my way to not overwrite >the upstream vendor directory=2E > >William -- Best regards,=20 Micha=C5=82 G=C3=B3rny