Gentoo Archives: gentoo-commits

From: Viorel Munteanu <ceamac@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: www-apps/hugo/
Date: Mon, 20 Mar 2023 06:43:28
Message-Id: 1679294585.b58bfca12d8af0a0da3c86a22cb840e0750117f4.ceamac@gentoo
1 commit: b58bfca12d8af0a0da3c86a22cb840e0750117f4
2 Author: Ronny (tastytea) Gutbrod <gentoo <AT> tastytea <DOT> de>
3 AuthorDate: Sun Mar 12 14:53:05 2023 +0000
4 Commit: Viorel Munteanu <ceamac <AT> gentoo <DOT> org>
5 CommitDate: Mon Mar 20 06:43:05 2023 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b58bfca1
7
8 www-apps/hugo: fix build flags
9
10 EGO_BUILD_FLAGS is only used in golang-build.eclass, not in
11 go-module.eclass.
12
13 Bug: https://github.com/gentoo/gentoo/pull/29807#issuecomment-1465214240
14 Signed-off-by: Ronny (tastytea) Gutbrod <gentoo <AT> tastytea.de>
15 Closes: https://github.com/gentoo/gentoo/pull/30047
16 Signed-off-by: Viorel Munteanu <ceamac <AT> gentoo.org>
17
18 www-apps/hugo/{hugo-0.110.0-r1.ebuild => hugo-0.110.0-r2.ebuild} | 6 +++---
19 www-apps/hugo/hugo-0.111.3.ebuild | 6 +++---
20 2 files changed, 6 insertions(+), 6 deletions(-)
21
22 diff --git a/www-apps/hugo/hugo-0.110.0-r1.ebuild b/www-apps/hugo/hugo-0.110.0-r2.ebuild
23 similarity index 93%
24 rename from www-apps/hugo/hugo-0.110.0-r1.ebuild
25 rename to www-apps/hugo/hugo-0.110.0-r2.ebuild
26 index 2844ad2eecb8..68c6effbbe55 100644
27 --- a/www-apps/hugo/hugo-0.110.0-r1.ebuild
28 +++ b/www-apps/hugo/hugo-0.110.0-r2.ebuild
29 @@ -48,7 +48,7 @@ src_configure() {
30 export CGO_CPPFLAGS="${CPPFLAGS}"
31 export CGO_CXXFLAGS="${CXXFLAGS}"
32 export CGO_LDFLAGS="${LDFLAGS}"
33 - export EGO_BUILD_FLAGS="$(usev sass "-tags extended")"
34 + export MY_BUILD_FLAGS="$(usev sass "-tags extended")"
35
36 default
37 }
38 @@ -56,7 +56,7 @@ src_configure() {
39 src_compile() {
40 mkdir -pv bin || die
41 ego build -ldflags "-X github.com/gohugoio/hugo/common/hugo.vendorInfo=gentoo:${PVR}" \
42 - -o "${S}/bin/hugo"
43 + ${MY_BUILD_FLAGS} -o "${S}/bin/hugo"
44
45 bin/hugo gen man --dir man || die
46
47 @@ -71,7 +71,7 @@ src_compile() {
48 }
49
50 src_test() {
51 - ego test "./..."
52 + ego test "./..." ${MY_BUILD_FLAGS}
53 }
54
55 src_install() {
56
57 diff --git a/www-apps/hugo/hugo-0.111.3.ebuild b/www-apps/hugo/hugo-0.111.3.ebuild
58 index ebf86fa34f56..7eb297bafecd 100644
59 --- a/www-apps/hugo/hugo-0.111.3.ebuild
60 +++ b/www-apps/hugo/hugo-0.111.3.ebuild
61 @@ -48,7 +48,7 @@ src_configure() {
62 export CGO_CPPFLAGS="${CPPFLAGS}"
63 export CGO_CXXFLAGS="${CXXFLAGS}"
64 export CGO_LDFLAGS="${LDFLAGS}"
65 - export EGO_BUILD_FLAGS="$(usev sass "-tags extended")"
66 + export MY_BUILD_FLAGS="$(usev sass "-tags extended")"
67
68 default
69 }
70 @@ -56,7 +56,7 @@ src_configure() {
71 src_compile() {
72 mkdir -pv bin || die
73 ego build -ldflags "-X github.com/gohugoio/hugo/common/hugo.vendorInfo=gentoo:${PVR}" \
74 - -o "${S}/bin/hugo"
75 + ${MY_BUILD_FLAGS} -o "${S}/bin/hugo"
76
77 bin/hugo gen man --dir man || die
78
79 @@ -71,7 +71,7 @@ src_compile() {
80 }
81
82 src_test() {
83 - ego test "./..."
84 + ego test "./..." ${MY_BUILD_FLAGS}
85 }
86
87 src_install() {