| 1 |
commit: 367a3e9287d0c00636a4845a55fcf97af93026df |
| 2 |
Author: Mark Wright <gienah <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Wed May 2 23:19:34 2018 +0000 |
| 4 |
Commit: Mark Wright <gienah <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Wed May 2 23:19:34 2018 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/proj/sci.git/commit/?id=367a3e92 |
| 7 |
|
| 8 |
sci-libs/tensorflow: Move our flags to bazel-get-flags() |
| 9 |
|
| 10 |
Package-Manager: Portage-2.3.33, Repoman-2.3.9 |
| 11 |
|
| 12 |
sci-libs/tensorflow/tensorflow-1.8.0.ebuild | 32 ++++++++++++++++------------- |
| 13 |
1 file changed, 18 insertions(+), 14 deletions(-) |
| 14 |
|
| 15 |
diff --git a/sci-libs/tensorflow/tensorflow-1.8.0.ebuild b/sci-libs/tensorflow/tensorflow-1.8.0.ebuild |
| 16 |
index cfef9ea2a..557095bc7 100644 |
| 17 |
--- a/sci-libs/tensorflow/tensorflow-1.8.0.ebuild |
| 18 |
+++ b/sci-libs/tensorflow/tensorflow-1.8.0.ebuild |
| 19 |
@@ -99,16 +99,7 @@ src_configure(){ |
| 20 |
python_foreach_impl python_configure |
| 21 |
} |
| 22 |
|
| 23 |
-src_compile() { |
| 24 |
- # F: fopen_wr |
| 25 |
- # S: deny |
| 26 |
- # P: /proc/self/setgroups |
| 27 |
- # A: /proc/self/setgroups |
| 28 |
- # R: /proc/7712/setgroups |
| 29 |
- # C: unable to read /proc/1/cmdline |
| 30 |
- addpredict /proc |
| 31 |
- |
| 32 |
- local opt=$(usex cuda "--config=cuda" "") |
| 33 |
+bazel-get-flags() { |
| 34 |
local fs="" |
| 35 |
for i in ${CXXFLAGS}; do |
| 36 |
[[ -n "${fs}" ]] && fs+=" " |
| 37 |
@@ -123,16 +114,29 @@ src_compile() { |
| 38 |
[[ -n "${fs}" ]] && fs+=" " |
| 39 |
fs+="--linkopt=${i}" |
| 40 |
done |
| 41 |
+ echo "${fs}" |
| 42 |
+} |
| 43 |
+ |
| 44 |
+src_compile() { |
| 45 |
+ # F: fopen_wr |
| 46 |
+ # S: deny |
| 47 |
+ # P: /proc/self/setgroups |
| 48 |
+ # A: /proc/self/setgroups |
| 49 |
+ # R: /proc/7712/setgroups |
| 50 |
+ # C: unable to read /proc/1/cmdline |
| 51 |
+ addpredict /proc |
| 52 |
+ |
| 53 |
+ local opt=$(usex cuda "--config=cuda" "") |
| 54 |
einfo ">>> Compiling ${PN} C"$(usex cxx " and C++" "") |
| 55 |
einfo " bazel build \\" |
| 56 |
einfo " --config=opt ${opt} \\" |
| 57 |
- einfo " ${fs} \\" |
| 58 |
+ einfo " $(bazel-get-flags) \\" |
| 59 |
einfo " //tensorflow:libtensorflow.so \\" |
| 60 |
einfo " //tensorflow:libtensorflow_framework.so \\" |
| 61 |
einfo " "$(usex cxx "//tensorflow:libtensorflow_cc.so" "") |
| 62 |
bazel build \ |
| 63 |
--config=opt ${opt} \ |
| 64 |
- ${fs} \ |
| 65 |
+ $(bazel-get-flags) \ |
| 66 |
//tensorflow:libtensorflow.so \ |
| 67 |
//tensorflow:libtensorflow_framework.so \ |
| 68 |
$(usex cxx "//tensorflow:libtensorflow_cc.so" "") || die |
| 69 |
@@ -141,11 +145,11 @@ src_compile() { |
| 70 |
einfo ">>> Compiling ${PN} ${MULTIBUILD_VARIANT}" |
| 71 |
einfo " bazel build \\" |
| 72 |
einfo " --config=opt ${opt} \\" |
| 73 |
- einfo " ${fs} \\" |
| 74 |
+ einfo " $(bazel-get-flags) \\" |
| 75 |
einfo " //tensorflow/tools/pip_package:build_pip_package" |
| 76 |
bazel build \ |
| 77 |
--config=opt ${opt} \ |
| 78 |
- ${fs} \ |
| 79 |
+ $(bazel-get-flags) \ |
| 80 |
//tensorflow/tools/pip_package:build_pip_package || die |
| 81 |
bazel-bin/tensorflow/tools/pip_package/build_pip_package tensorflow_pkg || die |
| 82 |
unzip -o -d ${PN}_pkg_${MULTIBUILD_VARIANT} ${PN}_pkg/${P}-*.whl || die |
Archives