From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 20CD7138334 for ; Thu, 2 Aug 2018 11:36:05 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 9F70CE07EE; Thu, 2 Aug 2018 11:36:02 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 231EBE07EE for ; Thu, 2 Aug 2018 11:36:01 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id D9237335CA8 for ; Thu, 2 Aug 2018 11:35:59 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 59218386 for ; Thu, 2 Aug 2018 11:35:57 +0000 (UTC) From: "Guilherme Amadio" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Guilherme Amadio" Message-ID: <1533209636.0cdff42fddd297f60d7b47d95fcdefc0ccf66793.amadio@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: sci-libs/tensorflow/ X-VCS-Repository: repo/gentoo X-VCS-Files: sci-libs/tensorflow/tensorflow-1.9.0.ebuild X-VCS-Directories: sci-libs/tensorflow/ X-VCS-Committer: amadio X-VCS-Committer-Name: Guilherme Amadio X-VCS-Revision: 0cdff42fddd297f60d7b47d95fcdefc0ccf66793 X-VCS-Branch: master Date: Thu, 2 Aug 2018 11:35:57 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Archives-Salt: bbc8ca72-1da1-48e4-80c7-cad293341147 X-Archives-Hash: 340d82642adee5da6f2b6f61c1edc5f7 commit: 0cdff42fddd297f60d7b47d95fcdefc0ccf66793 Author: Guilherme Amadio gentoo org> AuthorDate: Thu Aug 2 06:50:07 2018 +0000 Commit: Guilherme Amadio gentoo org> CommitDate: Thu Aug 2 11:33:56 2018 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0cdff42f sci-libs/tensorflow: add prefix support Package-Manager: Portage-2.3.44, Repoman-2.3.10 sci-libs/tensorflow/tensorflow-1.9.0.ebuild | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/sci-libs/tensorflow/tensorflow-1.9.0.ebuild b/sci-libs/tensorflow/tensorflow-1.9.0.ebuild index 696d6345d09..f1842e6e36f 100644 --- a/sci-libs/tensorflow/tensorflow-1.9.0.ebuild +++ b/sci-libs/tensorflow/tensorflow-1.9.0.ebuild @@ -301,8 +301,8 @@ src_configure() { export TF_CUDA_CLANG=0 export TF_NEED_TENSORRT=0 if use cuda; then - export CUDA_TOOLKIT_PATH="${EROOT%/}/opt/cuda" - export CUDNN_INSTALL_PATH="${EROOT%/}/opt/cuda" + export CUDA_TOOLKIT_PATH="${EPREFIX%/}/opt/cuda" + export CUDNN_INSTALL_PATH="${EPREFIX%/}/opt/cuda" export GCC_HOST_COMPILER_PATH="$(cuda_gccdir)/$(tc-getCC)" export TF_NCCL_VERSION="1" @@ -371,7 +371,7 @@ src_install() { # Symlink to the main .so file python_export PYTHON_SITEDIR rm -rf "${D}/${PYTHON_SITEDIR}/${PN}/lib${PN}_framework.so" || die - dosym "../../../lib${PN}_framework.so" "${PYTHON_SITEDIR}/${PN}/lib${PN}_framework.so" || die + dosym "../../../lib${PN}_framework.so" "${PYTHON_SITEDIR#${EPREFIX%/}}/${PN}/lib${PN}_framework.so" || die python_optimize } @@ -379,12 +379,12 @@ src_install() { if use python; then python_foreach_impl run_in_build_dir do_install - rm -f "${D}"/usr/lib/python-exec/*/tensorboard || die "failed to remove tensorboard" + rm -f "${ED}"/usr/lib/python-exec/*/tensorboard || die "failed to remove tensorboard" # Symlink to python-exec scripts - for i in "${D}"/usr/lib/python-exec/*/*; do + for i in "${ED}"/usr/lib/python-exec/*/*; do n="${i##*/}" - [[ -e "${D}/usr/bin/${n}" ]] || dosym ../lib/python-exec/python-exec2 "/usr/bin/$n" + [[ -e "${ED}/usr/bin/${n}" ]] || dosym ../lib/python-exec/python-exec2 "/usr/bin/$n" done python_setup @@ -413,7 +413,7 @@ src_install() { einfo "Installing libs" # Generate pkg-config file - ${PN}/c/generate-pc.sh --prefix=/usr --libdir=$(get_libdir) --version=${MY_PV} || die + ${PN}/c/generate-pc.sh --prefix="${EPREFIX}"/usr --libdir=$(get_libdir) --version=${MY_PV} || die insinto /usr/$(get_libdir)/pkgconfig doins ${PN}.pc