| 1 |
Signed-off-by: David Seifert <soap@g.o> |
| 2 |
--- |
| 3 |
eclass/golang-build.eclass | 24 ++++++++++-------------- |
| 4 |
1 file changed, 10 insertions(+), 14 deletions(-) |
| 5 |
|
| 6 |
diff --git a/eclass/golang-build.eclass b/eclass/golang-build.eclass |
| 7 |
index f24029a1a9fd..235313bd70f5 100644 |
| 8 |
--- a/eclass/golang-build.eclass |
| 9 |
+++ b/eclass/golang-build.eclass |
| 10 |
@@ -1,10 +1,10 @@ |
| 11 |
-# Copyright 1999-2019 Gentoo Authors |
| 12 |
+# Copyright 1999-2023 Gentoo Authors |
| 13 |
# Distributed under the terms of the GNU General Public License v2 |
| 14 |
|
| 15 |
# @ECLASS: golang-build.eclass |
| 16 |
# @MAINTAINER: |
| 17 |
# William Hubbs <williamh@g.o> |
| 18 |
-# @SUPPORTED_EAPIS: 5 6 7 |
| 19 |
+# @SUPPORTED_EAPIS: 6 7 |
| 20 |
# @PROVIDES: golang-base |
| 21 |
# @BLURB: Eclass for compiling go packages. |
| 22 |
# @DEPRECATED: go-module.eclass |
| 23 |
@@ -12,21 +12,15 @@ |
| 24 |
# This eclass provides default src_compile, src_test and src_install |
| 25 |
# functions for software written in the Go programming language. |
| 26 |
|
| 27 |
-inherit golang-base |
| 28 |
- |
| 29 |
-case "${EAPI:-0}" in |
| 30 |
- 5|6|7) |
| 31 |
- ;; |
| 32 |
- *) |
| 33 |
- die "${ECLASS}: Unsupported eapi (EAPI=${EAPI})" |
| 34 |
- ;; |
| 35 |
+case ${EAPI} in |
| 36 |
+ 6|7) ;; |
| 37 |
+ *) die "${ECLASS}: EAPI ${EAPI:-0} not supported" ;; |
| 38 |
esac |
| 39 |
|
| 40 |
-EXPORT_FUNCTIONS src_compile src_install src_test |
| 41 |
- |
| 42 |
-if [[ -z ${_GOLANG_BUILD} ]]; then |
| 43 |
+if [[ -z ${_GOLANG_BUILD_ECLASS} ]]; then |
| 44 |
+_GOLANG_BUILD_ECLASS=1 |
| 45 |
|
| 46 |
-_GOLANG_BUILD=1 |
| 47 |
+inherit golang-base |
| 48 |
|
| 49 |
# @ECLASS_VARIABLE: EGO_BUILD_FLAGS |
| 50 |
# @DEFAULT_UNSET |
| 51 |
@@ -85,3 +79,5 @@ golang-build_src_test() { |
| 52 |
} |
| 53 |
|
| 54 |
fi |
| 55 |
+ |
| 56 |
+EXPORT_FUNCTIONS src_compile src_install src_test |
| 57 |
-- |
| 58 |
2.40.0 |
Archives