| 1 |
commit: a14ecad8b352b82ab925546099a4014649338e08 |
| 2 |
Author: YiyangWu <xgreenlandforwyy <AT> gmail <DOT> com> |
| 3 |
AuthorDate: Fri Aug 27 09:20:54 2021 +0000 |
| 4 |
Commit: Benda XU <heroxbd <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Sat Nov 6 04:47:48 2021 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a14ecad8 |
| 7 |
|
| 8 |
dev-util/bazel: remove hack for Gentoo prefix |
| 9 |
|
| 10 |
In bazel-3.2 prefix and static-libs use flag is added concerning bug #773982 |
| 11 |
|
| 12 |
For bazel-3.7 the issue is gone and specifying static link flags causes build error. |
| 13 |
|
| 14 |
Closes: https://github.com/gentoo/gentoo/pull/22126 |
| 15 |
Bugs: https://bugs.gentoo.org/773982 |
| 16 |
Package-Manager: Portage-3.0.20, Repoman-3.0.3 |
| 17 |
Signed-off-by: Yiyang Wu <xgreenlandforwyy <AT> gmail.com> |
| 18 |
Signed-off-by: Benda Xu <heroxbd <AT> gentoo.org> |
| 19 |
|
| 20 |
dev-util/bazel/{bazel-3.7.2.ebuild => bazel-3.7.2-r1.ebuild} | 6 +----- |
| 21 |
1 file changed, 1 insertion(+), 5 deletions(-) |
| 22 |
|
| 23 |
diff --git a/dev-util/bazel/bazel-3.7.2.ebuild b/dev-util/bazel/bazel-3.7.2-r1.ebuild |
| 24 |
similarity index 93% |
| 25 |
rename from dev-util/bazel/bazel-3.7.2.ebuild |
| 26 |
rename to dev-util/bazel/bazel-3.7.2-r1.ebuild |
| 27 |
index 8f687a47d16..161e10ad821 100644 |
| 28 |
--- a/dev-util/bazel/bazel-3.7.2.ebuild |
| 29 |
+++ b/dev-util/bazel/bazel-3.7.2-r1.ebuild |
| 30 |
@@ -13,8 +13,7 @@ SRC_URI="https://github.com/bazelbuild/bazel/releases/download/${PV}/${P}-dist.z |
| 31 |
LICENSE="Apache-2.0" |
| 32 |
SLOT="0" |
| 33 |
KEYWORDS="~amd64" |
| 34 |
-IUSE="examples tools prefix static-libs" |
| 35 |
-REQUIRED_USE="prefix? ( static-libs )" |
| 36 |
+IUSE="examples tools" |
| 37 |
# strip corrupts the bazel binary |
| 38 |
# test fails with network-sandbox: An error occurred during the fetch of repository 'io_bazel_skydoc' (bug 690794) |
| 39 |
RESTRICT="strip test" |
| 40 |
@@ -71,9 +70,6 @@ src_prepare() { |
| 41 |
|
| 42 |
src_compile() { |
| 43 |
export EXTRA_BAZEL_ARGS="--jobs=$(makeopts_jobs) $(bazel-get-flags) --host_javabase=@local_jdk//:jdk" |
| 44 |
- if use static-libs; then |
| 45 |
- export BAZEL_LINKOPTS=-static-libs:-static-libgcc BAZEL_LINKLIBS=-l%:libstdc++.a:-lm |
| 46 |
- fi |
| 47 |
VERBOSE=yes ./compile.sh || die |
| 48 |
|
| 49 |
./scripts/generate_bash_completion.sh \ |
Archives