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 0F3F71382C5 for ; Mon, 8 Jun 2020 05:02:34 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 2CEA3E08C9; Mon, 8 Jun 2020 05:02:33 +0000 (UTC) Received: from smtp.gentoo.org (woodpecker.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (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 13BC9E08C9 for ; Mon, 8 Jun 2020 05:02:32 +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 A282C34E847 for ; Mon, 8 Jun 2020 05:02:31 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 8B52A28E for ; Mon, 8 Jun 2020 05:02:29 +0000 (UTC) From: "Jason Zaman" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Jason Zaman" Message-ID: <1591592130.4f0a1a643c32e762f1cf8f07cc14da184788080d.perfinion@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: sci-libs/tensorflow-estimator/ X-VCS-Repository: repo/gentoo X-VCS-Files: sci-libs/tensorflow-estimator/tensorflow-estimator-2.2.0-r1.ebuild sci-libs/tensorflow-estimator/tensorflow-estimator-2.2.0.ebuild X-VCS-Directories: sci-libs/tensorflow-estimator/ X-VCS-Committer: perfinion X-VCS-Committer-Name: Jason Zaman X-VCS-Revision: 4f0a1a643c32e762f1cf8f07cc14da184788080d X-VCS-Branch: master Date: Mon, 8 Jun 2020 05:02:29 +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-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: 134bce7a-662a-48d7-88fa-a2b2301178dc X-Archives-Hash: 023695221e8b3887c043e6b0841bb99e commit: 4f0a1a643c32e762f1cf8f07cc14da184788080d Author: Jason Zaman gentoo org> AuthorDate: Mon Jun 8 04:51:48 2020 +0000 Commit: Jason Zaman gentoo org> CommitDate: Mon Jun 8 04:55:30 2020 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4f0a1a64 sci-libs/tensorflow-estimator: fix compile error The bazel build step used the incorrect python, so duplicate the sources and build multiple times Closes: https://bugs.gentoo.org/725856 Package-Manager: Portage-2.3.99, Repoman-2.3.22 Signed-off-by: Jason Zaman gentoo.org> ....2.0.ebuild => tensorflow-estimator-2.2.0-r1.ebuild} | 17 +++++++++++------ 1 file changed, 11 insertions(+), 6 deletions(-) diff --git a/sci-libs/tensorflow-estimator/tensorflow-estimator-2.2.0.ebuild b/sci-libs/tensorflow-estimator/tensorflow-estimator-2.2.0-r1.ebuild similarity index 80% rename from sci-libs/tensorflow-estimator/tensorflow-estimator-2.2.0.ebuild rename to sci-libs/tensorflow-estimator/tensorflow-estimator-2.2.0-r1.ebuild index 32a54df07f9..20a13ee1c5a 100644 --- a/sci-libs/tensorflow-estimator/tensorflow-estimator-2.2.0.ebuild +++ b/sci-libs/tensorflow-estimator/tensorflow-estimator-2.2.0-r1.ebuild @@ -43,22 +43,27 @@ src_unpack() { src_prepare() { bazel_setup_bazelrc default + python_copy_sources } src_compile() { export JAVA_HOME=$(java-config --jre-home) - ebazel build //tensorflow_estimator/tools/pip_package:build_pip_package - ebazel shutdown + do_compile() { + ebazel build //tensorflow_estimator/tools/pip_package:build_pip_package + ebazel shutdown - local srcdir="${T}/src" - mkdir -p "${srcdir}" || die - bazel-bin/tensorflow_estimator/tools/pip_package/build_pip_package --src "${srcdir}" || die + local srcdir="${T}/src-${EPYTHON/./_}" + mkdir -p "${srcdir}" || die + bazel-bin/tensorflow_estimator/tools/pip_package/build_pip_package --src "${srcdir}" || die + } + + python_foreach_impl run_in_build_dir do_compile } src_install() { do_install() { - cd "${T}/src" || die + cd "${T}/src-${EPYTHON/./_}" || die esetup.py install python_optimize }