commit: 367a3e9287d0c00636a4845a55fcf97af93026df
Author: Mark Wright <gienah <AT> gentoo <DOT> org>
AuthorDate: Wed May 2 23:19:34 2018 +0000
Commit: Mark Wright <gienah <AT> gentoo <DOT> org>
CommitDate: Wed May 2 23:19:34 2018 +0000
URL: https://gitweb.gentoo.org/proj/sci.git/commit/?id=367a3e92
sci-libs/tensorflow: Move our flags to bazel-get-flags()
Package-Manager: Portage-2.3.33, Repoman-2.3.9
sci-libs/tensorflow/tensorflow-1.8.0.ebuild | 32 ++++++++++++++++-------------
1 file changed, 18 insertions(+), 14 deletions(-)
diff --git a/sci-libs/tensorflow/tensorflow-1.8.0.ebuild
b/sci-libs/tensorflow/tensorflow-1.8.0.ebuild
index cfef9ea2a..557095bc7 100644
--- a/sci-libs/tensorflow/tensorflow-1.8.0.ebuild
+++ b/sci-libs/tensorflow/tensorflow-1.8.0.ebuild
@@ -99,16 +99,7 @@ src_configure(){
python_foreach_impl python_configure
}
-src_compile() {
- # F: fopen_wr
- # S: deny
- # P: /proc/self/setgroups
- # A: /proc/self/setgroups
- # R: /proc/7712/setgroups
- # C: unable to read /proc/1/cmdline
- addpredict /proc
-
- local opt=$(usex cuda "--config=cuda" "")
+bazel-get-flags() {
local fs=""
for i in ${CXXFLAGS}; do
[[ -n "${fs}" ]] && fs+=" "
@@ -123,16 +114,29 @@ src_compile() {
[[ -n "${fs}" ]] && fs+=" "
fs+="--linkopt=${i}"
done
+ echo "${fs}"
+}
+
+src_compile() {
+ # F: fopen_wr
+ # S: deny
+ # P: /proc/self/setgroups
+ # A: /proc/self/setgroups
+ # R: /proc/7712/setgroups
+ # C: unable to read /proc/1/cmdline
+ addpredict /proc
+
+ local opt=$(usex cuda "--config=cuda" "")
einfo ">>> Compiling ${PN} C"$(usex cxx " and C++" "")
einfo " bazel build \\"
einfo " --config=opt ${opt} \\"
- einfo " ${fs} \\"
+ einfo " $(bazel-get-flags) \\"
einfo " //tensorflow:libtensorflow.so \\"
einfo " //tensorflow:libtensorflow_framework.so \\"
einfo " "$(usex cxx "//tensorflow:libtensorflow_cc.so" "")
bazel build \
--config=opt ${opt} \
- ${fs} \
+ $(bazel-get-flags) \
//tensorflow:libtensorflow.so \
//tensorflow:libtensorflow_framework.so \
$(usex cxx "//tensorflow:libtensorflow_cc.so" "") || die
@@ -141,11 +145,11 @@ src_compile() {
einfo ">>> Compiling ${PN} ${MULTIBUILD_VARIANT}"
einfo " bazel build \\"
einfo " --config=opt ${opt} \\"
- einfo " ${fs} \\"
+ einfo " $(bazel-get-flags) \\"
einfo " //tensorflow/tools/pip_package:build_pip_package"
bazel build \
--config=opt ${opt} \
- ${fs} \
+ $(bazel-get-flags) \
//tensorflow/tools/pip_package:build_pip_package ||
die
bazel-bin/tensorflow/tools/pip_package/build_pip_package
tensorflow_pkg || die
unzip -o -d ${PN}_pkg_${MULTIBUILD_VARIANT}
${PN}_pkg/${P}-*.whl || die
