commit: 554a3365c8a6807a02976a55462a9708638457e2
Author: Jason Zaman <perfinion <AT> gentoo <DOT> org>
AuthorDate: Wed Jul 3 05:08:22 2019 +0000
Commit: Jason Zaman <perfinion <AT> gentoo <DOT> org>
CommitDate: Wed Jul 3 05:49:10 2019 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=554a3365
dev-util/bazel: respect CFLAGS
The bazelrc was not used by the build so pass the flags directly to
bazel extra flags.
Thanks to Michael Martis for triaging and finding the fix.
Signed-off-by: Jason Zaman <perfinion <AT> gentoo.org>
Package-Manager: Portage-2.3.66, Repoman-2.3.11
.../{bazel-0.27.0.ebuild => bazel-0.24.1-r1.ebuild} | 17 ++---------------
.../{bazel-0.26.1.ebuild => bazel-0.26.1-r1.ebuild} | 19 +++----------------
.../{bazel-0.27.0.ebuild => bazel-0.27.0-r1.ebuild} | 17 ++---------------
3 files changed, 7 insertions(+), 46 deletions(-)
diff --git a/dev-util/bazel/bazel-0.27.0.ebuild
b/dev-util/bazel/bazel-0.24.1-r1.ebuild
similarity index 80%
copy from dev-util/bazel/bazel-0.27.0.ebuild
copy to dev-util/bazel/bazel-0.24.1-r1.ebuild
index 3011c92b93f..a1d730d5713 100644
--- a/dev-util/bazel/bazel-0.27.0.ebuild
+++ b/dev-util/bazel/bazel-0.24.1-r1.ebuild
@@ -22,7 +22,6 @@ DEPEND="${RDEPEND}
app-arch/zip"
S="${WORKDIR}"
-QA_FLAGS_IGNORED="usr/bin/bazel"
bazel-get-flags() {
local i fs=()
@@ -63,23 +62,10 @@ src_prepare() {
# R: /proc/24939/setgroups
# C: /usr/lib/systemd/systemd
addpredict /proc
-
- # Use standalone strategy to deactivate the bazel sandbox, since it
- # conflicts with FEATURES=sandbox.
- cat > "${T}/bazelrc" <<-EOF || die
- build --verbose_failures
- build --spawn_strategy=standalone --genrule_strategy=standalone
-
- build --distdir="${S}/derived/distdir/"
- build --jobs=$(makeopts_jobs) $(bazel-get-flags)
-
- test --verbose_failures --verbose_test_summary
- test --spawn_strategy=standalone --genrule_strategy=standalone
- EOF
}
src_compile() {
- export EXTRA_BAZEL_ARGS="--jobs=$(makeopts_jobs)
--host_javabase=@local_jdk//:jdk"
+ export EXTRA_BAZEL_ARGS="--jobs=$(makeopts_jobs) $(bazel-get-flags)
--host_javabase=@local_jdk//:jdk"
VERBOSE=yes ./compile.sh || die
./scripts/generate_bash_completion.sh \
@@ -117,5 +103,6 @@ src_install() {
docinto tools
dodoc -r tools/*
docompress -x /usr/share/doc/${PF}/tools
+ docompress -x /usr/share/doc/${PF}/tools/build_defs/pkg/testdata
fi
}
diff --git a/dev-util/bazel/bazel-0.26.1.ebuild
b/dev-util/bazel/bazel-0.26.1-r1.ebuild
similarity index 79%
rename from dev-util/bazel/bazel-0.26.1.ebuild
rename to dev-util/bazel/bazel-0.26.1-r1.ebuild
index f423e485530..a1d730d5713 100644
--- a/dev-util/bazel/bazel-0.26.1.ebuild
+++ b/dev-util/bazel/bazel-0.26.1-r1.ebuild
@@ -16,13 +16,12 @@ KEYWORDS="~amd64"
IUSE="examples test tools"
# strip corrupts the bazel binary
RESTRICT="strip test? ( network-sandbox ) !test? ( test )"
-RDEPEND=">=virtual/jdk-1.8"
+RDEPEND=">=virtual/jdk-1.8:*"
DEPEND="${RDEPEND}
app-arch/unzip
app-arch/zip"
S="${WORKDIR}"
-QA_FLAGS_IGNORED="usr/bin/bazel"
bazel-get-flags() {
local i fs=()
@@ -63,23 +62,10 @@ src_prepare() {
# R: /proc/24939/setgroups
# C: /usr/lib/systemd/systemd
addpredict /proc
-
- # Use standalone strategy to deactivate the bazel sandbox, since it
- # conflicts with FEATURES=sandbox.
- cat > "${T}/bazelrc" <<-EOF || die
- build --verbose_failures
- build --spawn_strategy=standalone --genrule_strategy=standalone
-
- build --distdir="${S}/derived/distdir/"
- build --jobs=$(makeopts_jobs) $(bazel-get-flags)
-
- test --verbose_failures --verbose_test_summary
- test --spawn_strategy=standalone --genrule_strategy=standalone
- EOF
}
src_compile() {
- export EXTRA_BAZEL_ARGS="--jobs=$(makeopts_jobs)
--host_javabase=@local_jdk//:jdk"
+ export EXTRA_BAZEL_ARGS="--jobs=$(makeopts_jobs) $(bazel-get-flags)
--host_javabase=@local_jdk//:jdk"
VERBOSE=yes ./compile.sh || die
./scripts/generate_bash_completion.sh \
@@ -117,5 +103,6 @@ src_install() {
docinto tools
dodoc -r tools/*
docompress -x /usr/share/doc/${PF}/tools
+ docompress -x /usr/share/doc/${PF}/tools/build_defs/pkg/testdata
fi
}
diff --git a/dev-util/bazel/bazel-0.27.0.ebuild
b/dev-util/bazel/bazel-0.27.0-r1.ebuild
similarity index 80%
rename from dev-util/bazel/bazel-0.27.0.ebuild
rename to dev-util/bazel/bazel-0.27.0-r1.ebuild
index 3011c92b93f..a1d730d5713 100644
--- a/dev-util/bazel/bazel-0.27.0.ebuild
+++ b/dev-util/bazel/bazel-0.27.0-r1.ebuild
@@ -22,7 +22,6 @@ DEPEND="${RDEPEND}
app-arch/zip"
S="${WORKDIR}"
-QA_FLAGS_IGNORED="usr/bin/bazel"
bazel-get-flags() {
local i fs=()
@@ -63,23 +62,10 @@ src_prepare() {
# R: /proc/24939/setgroups
# C: /usr/lib/systemd/systemd
addpredict /proc
-
- # Use standalone strategy to deactivate the bazel sandbox, since it
- # conflicts with FEATURES=sandbox.
- cat > "${T}/bazelrc" <<-EOF || die
- build --verbose_failures
- build --spawn_strategy=standalone --genrule_strategy=standalone
-
- build --distdir="${S}/derived/distdir/"
- build --jobs=$(makeopts_jobs) $(bazel-get-flags)
-
- test --verbose_failures --verbose_test_summary
- test --spawn_strategy=standalone --genrule_strategy=standalone
- EOF
}
src_compile() {
- export EXTRA_BAZEL_ARGS="--jobs=$(makeopts_jobs)
--host_javabase=@local_jdk//:jdk"
+ export EXTRA_BAZEL_ARGS="--jobs=$(makeopts_jobs) $(bazel-get-flags)
--host_javabase=@local_jdk//:jdk"
VERBOSE=yes ./compile.sh || die
./scripts/generate_bash_completion.sh \
@@ -117,5 +103,6 @@ src_install() {
docinto tools
dodoc -r tools/*
docompress -x /usr/share/doc/${PF}/tools
+ docompress -x /usr/share/doc/${PF}/tools/build_defs/pkg/testdata
fi
}
