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 951D9138334 for ; Wed, 11 Sep 2019 18:31:27 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 951B0E0A99; Wed, 11 Sep 2019 18:31:23 +0000 (UTC) Received: from smtp.gentoo.org (smtp.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 8FB24E0A63 for ; Wed, 11 Sep 2019 18:31:22 +0000 (UTC) Received: from pomiot (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 99B9934B0AC; Wed, 11 Sep 2019 18:31:20 +0000 (UTC) Message-ID: Subject: Re: [gentoo-dev] [PATCH 1/3] go-module.eclass: introduce new eclass to handle go modules From: =?UTF-8?Q?Micha=C5=82_G=C3=B3rny?= To: gentoo-dev@lists.gentoo.org Date: Wed, 11 Sep 2019 20:31:16 +0200 In-Reply-To: <20190911182238.GA19361@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> Organization: Gentoo Content-Type: multipart/signed; micalg="pgp-sha512"; protocol="application/pgp-signature"; boundary="=-IFdRrowNuHOBEoVeyKCI" User-Agent: Evolution 3.32.4 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 X-Archives-Salt: a0fc08c9-c88a-41cf-ac37-88f061d462f6 X-Archives-Hash: 3389ea5624b6cc2ce63829cf9dea8f77 --=-IFdRrowNuHOBEoVeyKCI Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: quoted-printable 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 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. >=20 > Sure, I thought I ffixed that. >=20 > > > +# 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? >=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. >=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 ba= sic > > > +# 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-* eclas= ses. > > > +# > > > +# 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. > > > +# > > > +# If it doesn't, you need to create a tarball of what would be in th= e > > > +# 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? >=20 > The primary reason for all of the golang-* eclasses was the GOPATH > variable, which is not relevant when you are using modules. >=20 > 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 director= y. > > > +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. >=20 > You would definitely need an eclass (see the settings and dependencies). >=20 > 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. I mean packing it as 'spire-1.2.3/vendor' or whatever the package directory is, so that it extracts correctly instead of making a tarball that needs to be moved afterwards. >=20 > What I tried to avoid was stomping on the vendor directory if it is > included upstream. You do that anyway by moving files. >=20 > William > > > +} > > > + > > > +fi > >=20 > > --=20 > > Best regards, > > Micha=C5=82 G=C3=B3rny > >=20 >=20 >=20 --=20 Best regards, Micha=C5=82 G=C3=B3rny --=-IFdRrowNuHOBEoVeyKCI Content-Type: application/pgp-signature; name="signature.asc" Content-Description: This is a digitally signed message part Content-Transfer-Encoding: 7bit -----BEGIN PGP SIGNATURE----- iQGTBAABCgB9FiEEx2qEUJQJjSjMiybFY5ra4jKeJA4FAl15PXRfFIAAAAAALgAo aXNzdWVyLWZwckBub3RhdGlvbnMub3BlbnBncC5maWZ0aGhvcnNlbWFuLm5ldEM3 NkE4NDUwOTQwOThEMjhDQzhCMjZDNTYzOUFEQUUyMzI5RTI0MEUACgkQY5ra4jKe JA762gf/YnoRcDFPdmP/xNT3JOEaeS0YjUqCWR9HhY0V/Deujmx1zcKT8j7TQXBq jTnFeVzIbI5Q4Lk2mnuyQHZykJ/C6p7o9W9/gb3bkMoK17aZQZOZ7oj5oYOnUU89 u6YJRLMbgFSIFeOLCIstN3Tc3ahybzlK4IwYmAYHHCwLVkNG8dn0ewLM7vOOsnh4 zPt07BtNlJGU5kJxb7reUJa9HeJ7yJwSxTr5I8lR/2Xe33Qje4qNAcQqG6k0wbIL 5LAWVweXfuX+bmACUtluVOiBFflP2i+oP/vI7hI833xJdIFqDS88arxYz0VVCAAF rmPlkkYF4Qe3CNEd9A6UfKBpx7+V3Q== =W8nU -----END PGP SIGNATURE----- --=-IFdRrowNuHOBEoVeyKCI--