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@gentoo.org>
Package-Manager: Portage-2.3.66, Repoman-2.3.11

diff --git a/dev-util/bazel/bazel-0.27.0.ebuild b/dev-util/bazel/bazel-0.24.1-r1.ebuild
similarity index 80%
rename from dev-util/bazel/bazel-0.27.0.ebuild
rename to dev-util/bazel/bazel-0.24.1-r1.ebuild
index 3011c92b93f32f5958f5be2bc8084331c8c0d0a7..a1d730d571338ac27b4ed8b9fe2e36c3e50665e4 100644 (file)
--- 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 f423e48553009716b6dc50929a6a83036bc6761f..a1d730d571338ac27b4ed8b9fe2e36c3e50665e4 100644 (file)
--- 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-r1.ebuild b/dev-util/bazel/bazel-0.27.0-r1.ebuild
new file mode 100644 (file)
index 0000000..a1d730d
--- /dev/null
+++ b/dev-util/bazel/bazel-0.27.0-r1.ebuild
@@ -0,0 +1,108 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit bash-completion-r1 java-pkg-2 multiprocessing
+
+DESCRIPTION="Fast and correct automated build system"
+HOMEPAGE="https://bazel.build/"
+
+SRC_URI="https://github.com/bazelbuild/bazel/releases/download/${PV}/${P}-dist.zip"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE="examples test tools"
+# strip corrupts the bazel binary
+RESTRICT="strip test? ( network-sandbox ) !test? ( test )"
+RDEPEND=">=virtual/jdk-1.8:*"
+DEPEND="${RDEPEND}
+       app-arch/unzip
+       app-arch/zip"
+
+S="${WORKDIR}"
+
+bazel-get-flags() {
+       local i fs=()
+       for i in ${CFLAGS}; do
+               fs+=( "--copt=${i}" "--host_copt=${i}" )
+       done
+       for i in ${CXXFLAGS}; do
+               fs+=( "--cxxopt=${i}" "--host_cxxopt=${i}" )
+       done
+       for i in ${CPPFLAGS}; do
+               fs+=( "--copt=${i}" "--host_copt=${i}" )
+               fs+=( "--cxxopt=${i}" "--host_cxxopt=${i}" )
+       done
+       for i in ${LDFLAGS}; do
+               fs+=( "--linkopt=${i}" "--host_linkopt=${i}" )
+       done
+       echo "${fs[*]}"
+}
+
+pkg_setup() {
+       echo ${PATH} | grep -q ccache && \
+               ewarn "${PN} usually fails to compile with ccache, you have been warned"
+       java-pkg-2_pkg_setup
+}
+
+src_unpack() {
+       # Only unpack the main distfile
+       unpack ${P}-dist.zip
+}
+
+src_prepare() {
+       default
+
+       # F: fopen_wr
+       # S: deny
+       # P: /proc/self/setgroups
+       # A: /proc/self/setgroups
+       # R: /proc/24939/setgroups
+       # C: /usr/lib/systemd/systemd
+       addpredict /proc
+}
+
+src_compile() {
+       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 \
+               --bazel=output/bazel \
+               --output=bazel-complete.bash \
+               --prepend=scripts/bazel-complete-header.bash \
+               --prepend=scripts/bazel-complete-template.bash
+}
+
+src_test() {
+       output/bazel test \
+               --verbose_failures \
+               --spawn_strategy=standalone \
+               --genrule_strategy=standalone \
+               --verbose_test_summary \
+               examples/cpp:hello-success_test || die
+       output/bazel shutdown
+}
+
+src_install() {
+       dobin output/bazel
+       newbashcomp bazel-complete.bash ${PN}
+       bashcomp_alias ${PN} ibazel
+       insinto /usr/share/zsh/site-functions
+       doins scripts/zsh_completion/_bazel
+
+       if use examples; then
+               docinto examples
+               dodoc -r examples/*
+               docompress -x /usr/share/doc/${PF}/examples
+       fi
+       # could really build tools but I don't know which ones
+       # are actually used
+       if use tools; then
+               docinto tools
+               dodoc -r tools/*
+               docompress -x /usr/share/doc/${PF}/tools
+               docompress -x /usr/share/doc/${PF}/tools/build_defs/pkg/testdata
+       fi
+}