Gentoo Archives: gentoo-commits

From: William Hubbs <williamh@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: eclass/
Date: Thu, 07 Feb 2019 19:25:47
Message-Id: 1549567349.a75afb393efb72d4e55832468d6e69895c1a3a70.williamh@gentoo
1 commit: a75afb393efb72d4e55832468d6e69895c1a3a70
2 Author: William Hubbs <williamh <AT> gentoo <DOT> org>
3 AuthorDate: Mon Feb 4 18:10:46 2019 +0000
4 Commit: William Hubbs <williamh <AT> gentoo <DOT> org>
5 CommitDate: Thu Feb 7 19:22:29 2019 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a75afb39
7
8 golang-base.eclass: add eapi 7 support
9
10 Signed-off-by: William Hubbs <williamh <AT> gentoo.org>
11
12 eclass/golang-base.eclass | 14 ++++++++++----
13 1 file changed, 10 insertions(+), 4 deletions(-)
14
15 diff --git a/eclass/golang-base.eclass b/eclass/golang-base.eclass
16 index c8308d28665..cd36a269bf1 100644
17 --- a/eclass/golang-base.eclass
18 +++ b/eclass/golang-base.eclass
19 @@ -4,7 +4,7 @@
20 # @ECLASS: golang-base.eclass
21 # @MAINTAINER:
22 # William Hubbs <williamh@g.o>
23 -# @SUPPORTED_EAPIS: 5 6
24 +# @SUPPORTED_EAPIS: 5 6 7
25 # @BLURB: Eclass that provides base functions for Go packages.
26 # @DESCRIPTION:
27 # This eclass provides base functions for software written in the Go
28 @@ -12,7 +12,7 @@
29 # dev-lang/go.
30
31 case "${EAPI:-0}" in
32 - 5|6)
33 + 5|6|7)
34 ;;
35 *)
36 die "${ECLASS}: Unsupported eapi (EAPI=${EAPI})"
37 @@ -23,12 +23,18 @@ if [[ -z ${_GOLANG_BASE} ]]; then
38
39 _GOLANG_BASE=1
40
41 -DEPEND=">=dev-lang/go-1.9"
42 +GO_DEPEND=">=dev-lang/go-1.10"
43 +if [[ ${EAPI:-0} == [56] ]]; then
44 + DEPEND="${GO_DEPEND}"
45 +else
46 + BDEPEND="${GO_DEPEND}"
47 +fi
48
49 # Do not complain about CFLAGS etc since go projects do not use them.
50 QA_FLAGS_IGNORED='.*'
51
52 -STRIP_MASK="*.a"
53 +# Upstream does not support stripping go packages
54 +RESTRICT="strip"
55
56 # @ECLASS-VARIABLE: EGO_PN
57 # @REQUIRED