From 554a3365c8a6807a02976a55462a9708638457e2 Mon Sep 17 00:00:00 2001
From: Jason Zaman <perfinion@gentoo.org>
Date: Wed, 3 Jul 2019 13:08:22 +0800
Subject: 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
---
 dev-util/bazel/bazel-0.24.1-r1.ebuild | 108 ++++++++++++++++++++++++++++++
 dev-util/bazel/bazel-0.26.1-r1.ebuild | 108 ++++++++++++++++++++++++++++++
 dev-util/bazel/bazel-0.26.1.ebuild    | 121 ----------------------------------
 dev-util/bazel/bazel-0.27.0-r1.ebuild | 108 ++++++++++++++++++++++++++++++
 dev-util/bazel/bazel-0.27.0.ebuild    | 121 ----------------------------------
 5 files changed, 324 insertions(+), 242 deletions(-)
 create mode 100644 dev-util/bazel/bazel-0.24.1-r1.ebuild
 create mode 100644 dev-util/bazel/bazel-0.26.1-r1.ebuild
 delete mode 100644 dev-util/bazel/bazel-0.26.1.ebuild
 create mode 100644 dev-util/bazel/bazel-0.27.0-r1.ebuild
 delete mode 100644 dev-util/bazel/bazel-0.27.0.ebuild

(limited to 'dev-util')

diff --git a/dev-util/bazel/bazel-0.24.1-r1.ebuild b/dev-util/bazel/bazel-0.24.1-r1.ebuild
new file mode 100644
index 000000000000..a1d730d57133
--- /dev/null
+++ b/dev-util/bazel/bazel-0.24.1-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
+}
diff --git a/dev-util/bazel/bazel-0.26.1-r1.ebuild b/dev-util/bazel/bazel-0.26.1-r1.ebuild
new file mode 100644
index 000000000000..a1d730d57133
--- /dev/null
+++ b/dev-util/bazel/bazel-0.26.1-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
+}
diff --git a/dev-util/bazel/bazel-0.26.1.ebuild b/dev-util/bazel/bazel-0.26.1.ebuild
deleted file mode 100644
index f423e4855300..000000000000
--- a/dev-util/bazel/bazel-0.26.1.ebuild
+++ /dev/null
@@ -1,121 +0,0 @@
-# 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}"
-QA_FLAGS_IGNORED="usr/bin/bazel"
-
-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
-
-	# 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"
-	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
-	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
index 000000000000..a1d730d57133
--- /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
+}
diff --git a/dev-util/bazel/bazel-0.27.0.ebuild b/dev-util/bazel/bazel-0.27.0.ebuild
deleted file mode 100644
index 3011c92b93f3..000000000000
--- a/dev-util/bazel/bazel-0.27.0.ebuild
+++ /dev/null
@@ -1,121 +0,0 @@
-# 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}"
-QA_FLAGS_IGNORED="usr/bin/bazel"
-
-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
-
-	# 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"
-	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
-	fi
-}
-- 
cgit v1.2.3-65-gdbad