Gentoo Archives: gentoo-commits

From: Guilherme Amadio <amadio@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: sci-libs/tensorflow/
Date: Thu, 02 Aug 2018 11:36:05
Message-Id: 1533209636.0cdff42fddd297f60d7b47d95fcdefc0ccf66793.amadio@gentoo
1 commit: 0cdff42fddd297f60d7b47d95fcdefc0ccf66793
2 Author: Guilherme Amadio <amadio <AT> gentoo <DOT> org>
3 AuthorDate: Thu Aug 2 06:50:07 2018 +0000
4 Commit: Guilherme Amadio <amadio <AT> gentoo <DOT> org>
5 CommitDate: Thu Aug 2 11:33:56 2018 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0cdff42f
7
8 sci-libs/tensorflow: add prefix support
9
10 Package-Manager: Portage-2.3.44, Repoman-2.3.10
11
12 sci-libs/tensorflow/tensorflow-1.9.0.ebuild | 14 +++++++-------
13 1 file changed, 7 insertions(+), 7 deletions(-)
14
15 diff --git a/sci-libs/tensorflow/tensorflow-1.9.0.ebuild b/sci-libs/tensorflow/tensorflow-1.9.0.ebuild
16 index 696d6345d09..f1842e6e36f 100644
17 --- a/sci-libs/tensorflow/tensorflow-1.9.0.ebuild
18 +++ b/sci-libs/tensorflow/tensorflow-1.9.0.ebuild
19 @@ -301,8 +301,8 @@ src_configure() {
20 export TF_CUDA_CLANG=0
21 export TF_NEED_TENSORRT=0
22 if use cuda; then
23 - export CUDA_TOOLKIT_PATH="${EROOT%/}/opt/cuda"
24 - export CUDNN_INSTALL_PATH="${EROOT%/}/opt/cuda"
25 + export CUDA_TOOLKIT_PATH="${EPREFIX%/}/opt/cuda"
26 + export CUDNN_INSTALL_PATH="${EPREFIX%/}/opt/cuda"
27 export GCC_HOST_COMPILER_PATH="$(cuda_gccdir)/$(tc-getCC)"
28 export TF_NCCL_VERSION="1"
29
30 @@ -371,7 +371,7 @@ src_install() {
31 # Symlink to the main .so file
32 python_export PYTHON_SITEDIR
33 rm -rf "${D}/${PYTHON_SITEDIR}/${PN}/lib${PN}_framework.so" || die
34 - dosym "../../../lib${PN}_framework.so" "${PYTHON_SITEDIR}/${PN}/lib${PN}_framework.so" || die
35 + dosym "../../../lib${PN}_framework.so" "${PYTHON_SITEDIR#${EPREFIX%/}}/${PN}/lib${PN}_framework.so" || die
36
37 python_optimize
38 }
39 @@ -379,12 +379,12 @@ src_install() {
40 if use python; then
41 python_foreach_impl run_in_build_dir do_install
42
43 - rm -f "${D}"/usr/lib/python-exec/*/tensorboard || die "failed to remove tensorboard"
44 + rm -f "${ED}"/usr/lib/python-exec/*/tensorboard || die "failed to remove tensorboard"
45
46 # Symlink to python-exec scripts
47 - for i in "${D}"/usr/lib/python-exec/*/*; do
48 + for i in "${ED}"/usr/lib/python-exec/*/*; do
49 n="${i##*/}"
50 - [[ -e "${D}/usr/bin/${n}" ]] || dosym ../lib/python-exec/python-exec2 "/usr/bin/$n"
51 + [[ -e "${ED}/usr/bin/${n}" ]] || dosym ../lib/python-exec/python-exec2 "/usr/bin/$n"
52 done
53
54 python_setup
55 @@ -413,7 +413,7 @@ src_install() {
56
57 einfo "Installing libs"
58 # Generate pkg-config file
59 - ${PN}/c/generate-pc.sh --prefix=/usr --libdir=$(get_libdir) --version=${MY_PV} || die
60 + ${PN}/c/generate-pc.sh --prefix="${EPREFIX}"/usr --libdir=$(get_libdir) --version=${MY_PV} || die
61 insinto /usr/$(get_libdir)/pkgconfig
62 doins ${PN}.pc