<pre style='margin:0'>
Chris Jones (cjones051073) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/27fd8386e1368c78272aecd311ca61abb12cbd47">https://github.com/macports/macports-ports/commit/27fd8386e1368c78272aecd311ca61abb12cbd47</a></p>
<pre style="white-space: pre; background: #F8F8F8">The following commit(s) were added to refs/heads/master by this push:
<span style='display:block; white-space:pre;color:#404040;'> new 27fd8386e13 bazel PG, misc. dependent ports: Add work around to help ensure correct python used by build
</span>27fd8386e13 is described below
<span style='display:block; white-space:pre;color:#808000;'>commit 27fd8386e1368c78272aecd311ca61abb12cbd47
</span>Author: Chris Jones <jonesc@macports.org>
AuthorDate: Wed May 12 21:00:01 2021 +0100
<span style='display:block; white-space:pre;color:#404040;'> bazel PG, misc. dependent ports: Add work around to help ensure correct python used by build
</span>---
_resources/port1.0/group/bazel-1.0.tcl | 27 ++++++++++++++++++++++-----
python/py-tensorflow-addons/Portfile | 8 +++-----
python/py-tensorflow-metadata/Portfile | 7 ++++---
python/py-tensorflow-probability/Portfile | 8 +-------
python/py-tensorflow/Portfile | 4 +++-
python/py-tensorflow1/Portfile | 5 ++++-
6 files changed, 37 insertions(+), 22 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/_resources/port1.0/group/bazel-1.0.tcl b/_resources/port1.0/group/bazel-1.0.tcl
</span><span style='display:block; white-space:pre;color:#808080;'>index 4782894f173..c5d49d98420 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/_resources/port1.0/group/bazel-1.0.tcl
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/_resources/port1.0/group/bazel-1.0.tcl
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -67,6 +67,9 @@ default bazel.cxx_standard 2014
</span> options bazel.path
default bazel.path {}
<span style='display:block; white-space:pre;background:#e0ffe0;'>+options bazel.python_version
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+default bazel.python_version ""
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> proc bazel::add_to_envs { var } {
foreach phase {configure build destroot} {
${phase}.env-append ${var}
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -184,6 +187,20 @@ proc bazel::set_configure {} {
</span> }
port::register_callback bazel::set_configure
<span style='display:block; white-space:pre;background:#e0ffe0;'>+post-extract {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if { [option bazel.python_version] ne "" } {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # Make sure selected python version is found via PATH as python and python3
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ global workpath prefix
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set py_ver [option bazel.python_version]
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set py_ver_nodot [string map {. {}} ${py_ver}]
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ depends_build-append port:python${py_ver_nodot}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ xinstall -d ${workpath}/bin
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ln -s ${prefix}/bin/python${py_ver} ${workpath}/bin/python
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ln -s ${prefix}/bin/python${py_ver} ${workpath}/bin/python3
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ bazel.path-append ${workpath}/bin
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> # Patch configuration
pre-configure {
# enforce correct build settings
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -249,6 +266,11 @@ pre-build {
</span> }
}
<span style='display:block; white-space:pre;background:#e0ffe0;'>+post-build {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # Post build command
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ system -W ${worksrcpath} "[option bazel.post_build_cmd]"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> proc bazel::get_cmd_opts {} {
global bazel.max_idle_secs
# Generate the bazel build command
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -349,8 +371,3 @@ proc bazel::configure_build {} {
</span> }
}
port::register_callback bazel::configure_build
<span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-post-build {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # Post build command
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- system -W ${worksrcpath} "[option bazel.post_build_cmd]"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-}
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/python/py-tensorflow-addons/Portfile b/python/py-tensorflow-addons/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index cc993a04917..758d4f53746 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/python/py-tensorflow-addons/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/python/py-tensorflow-addons/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -67,14 +67,12 @@ if {${name} ne ${subport}} {
</span> port:py${python.version}-typing_extensions
post-extract {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- xinstall -d ${workpath}/bin
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ln -s ${python.bin} ${workpath}/bin/python
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ln -s ${python.bin} ${workpath}/bin/python3
</span> reinplace "s| python | ${python.bin} |g" build_deps/build_pip_pkg.sh
reinplace "s|macosx_10_13|macosx_10_10|g" build_deps/build_pip_pkg.sh
}
<span style='display:block; white-space:pre;background:#ffe0e0;'>- bazel.path-append ${workpath}/bin
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- bazel.path-append ${python.prefix}/bin
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # Use correct python in bazel build
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ bazel.python_version ${python.branch}
</span>
use_configure yes
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/python/py-tensorflow-metadata/Portfile b/python/py-tensorflow-metadata/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 8eba87b01ae..7e86dad3a59 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/python/py-tensorflow-metadata/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/python/py-tensorflow-metadata/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -58,10 +58,11 @@ if {${name} ne ${subport}} {
</span> ${bazel_build_workspace_path}/tensorflow_metadata/proto/v0
post-extract {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- xinstall -d ${workpath}/bin ${bazel_build_proto_path}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ln -s ${python.bin} ${workpath}/bin/python
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ xinstall -d ${bazel_build_proto_path}
</span> }
<span style='display:block; white-space:pre;background:#ffe0e0;'>- bazel.path-append ${workpath}/bin
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # Use correct python in bazel build
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ bazel.python_version ${python.branch}
</span>
# replace with patch files after this repo is a little more stable
post-patch {
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/python/py-tensorflow-probability/Portfile b/python/py-tensorflow-probability/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 1bf37c4d66d..98bff6e6a18 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/python/py-tensorflow-probability/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/python/py-tensorflow-probability/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -56,13 +56,7 @@ if {${name} ne ${subport}} {
</span> port:py${python.version}-pytest
# Use correct python
<span style='display:block; white-space:pre;background:#ffe0e0;'>- post-extract {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- xinstall -d ${workpath}/bin
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ln -s ${python.bin} ${workpath}/bin/python
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ln -s ${python.bin} ${workpath}/bin/python3
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- bazel.path-append ${workpath}/bin
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- bazel.path-append ${python.prefix}/bin
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ bazel.python_version ${python.branch}
</span>
bazel.build_target \
:pip_pkg
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/python/py-tensorflow/Portfile b/python/py-tensorflow/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 0441bc75045..a572d393ac7 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/python/py-tensorflow/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/python/py-tensorflow/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -104,7 +104,9 @@ if {${name} ne ${subport}} {
</span> # Options passed to configure script via env vars
bazel::add_to_envs PYTHON_LIB_PATH=${python.prefix}/lib/python${python.branch}/site-packages
bazel::add_to_envs PYTHON_BIN_PATH=${prefix}/bin/python${python.branch}
<span style='display:block; white-space:pre;background:#ffe0e0;'>- bazel.path-append ${python.prefix}/bin
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # Use correct python in bazel build
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ bazel.python_version ${python.branch}
</span>
bazel.build_target "//tensorflow/tools/pip_package:build_pip_package"
bazel.post_build_cmd ./bazel-bin/tensorflow/tools/pip_package/build_pip_package [list $workpath]
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/python/py-tensorflow1/Portfile b/python/py-tensorflow1/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 338cde1ced4..67f8b3108b9 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/python/py-tensorflow1/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/python/py-tensorflow1/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -94,10 +94,13 @@ if {${name} ne ${subport}} {
</span> port:py${python.version}-wrapt
use_configure yes
<span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> # Options passed to configure script via env vars
bazel::add_to_envs PYTHON_LIB_PATH=${python.prefix}/lib/python${python.branch}/site-packages
bazel::add_to_envs PYTHON_BIN_PATH=${prefix}/bin/python${python.branch}
<span style='display:block; white-space:pre;background:#ffe0e0;'>- bazel.path-append ${python.prefix}/bin
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # Use correct python in bazel build
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ bazel.python_version ${python.branch}
</span>
bazel.build_target "//tensorflow/tools/pip_package:build_pip_package"
bazel.post_build_cmd ./bazel-bin/tensorflow/tools/pip_package/build_pip_package [list $workpath]
</pre><pre style='margin:0'>
</pre>