commit:     a14ecad8b352b82ab925546099a4014649338e08
Author:     YiyangWu <xgreenlandforwyy <AT> gmail <DOT> com>
AuthorDate: Fri Aug 27 09:20:54 2021 +0000
Commit:     Benda XU <heroxbd <AT> gentoo <DOT> org>
CommitDate: Sat Nov  6 04:47:48 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a14ecad8

dev-util/bazel: remove hack for Gentoo prefix

In bazel-3.2 prefix and static-libs use flag is added concerning bug #773982

For bazel-3.7 the issue is gone and specifying static link flags causes build 
error.

Closes: https://github.com/gentoo/gentoo/pull/22126
Bugs: https://bugs.gentoo.org/773982
Package-Manager: Portage-3.0.20, Repoman-3.0.3
Signed-off-by: Yiyang Wu <xgreenlandforwyy <AT> gmail.com>
Signed-off-by: Benda Xu <heroxbd <AT> gentoo.org>

 dev-util/bazel/{bazel-3.7.2.ebuild => bazel-3.7.2-r1.ebuild} | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

diff --git a/dev-util/bazel/bazel-3.7.2.ebuild 
b/dev-util/bazel/bazel-3.7.2-r1.ebuild
similarity index 93%
rename from dev-util/bazel/bazel-3.7.2.ebuild
rename to dev-util/bazel/bazel-3.7.2-r1.ebuild
index 8f687a47d16..161e10ad821 100644
--- a/dev-util/bazel/bazel-3.7.2.ebuild
+++ b/dev-util/bazel/bazel-3.7.2-r1.ebuild
@@ -13,8 +13,7 @@ 
SRC_URI="https://github.com/bazelbuild/bazel/releases/download/${PV}/${P}-dist.z
 LICENSE="Apache-2.0"
 SLOT="0"
 KEYWORDS="~amd64"
-IUSE="examples tools prefix static-libs"
-REQUIRED_USE="prefix? ( static-libs )"
+IUSE="examples tools"
 # strip corrupts the bazel binary
 # test fails with network-sandbox: An error occurred during the fetch of 
repository 'io_bazel_skydoc' (bug 690794)
 RESTRICT="strip test"
@@ -71,9 +70,6 @@ src_prepare() {
 
 src_compile() {
        export EXTRA_BAZEL_ARGS="--jobs=$(makeopts_jobs) $(bazel-get-flags) 
--host_javabase=@local_jdk//:jdk"
-       if use static-libs; then
-               export BAZEL_LINKOPTS=-static-libs:-static-libgcc 
BAZEL_LINKLIBS=-l%:libstdc++.a:-lm
-       fi
        VERBOSE=yes ./compile.sh || die
 
        ./scripts/generate_bash_completion.sh \

Reply via email to