<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/f85ef819267e3f293952ccf9013447ad5d37cd88">https://github.com/macports/macports-ports/commit/f85ef819267e3f293952ccf9013447ad5d37cd88</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 f85ef81 py-tensorflow: Update c++ standard to 2014, fix build file patching
</span>f85ef81 is described below
<span style='display:block; white-space:pre;color:#808000;'>commit f85ef819267e3f293952ccf9013447ad5d37cd88
</span>Author: Chris Jones <jonesc@macports.org>
AuthorDate: Fri Jan 10 11:27:23 2020 +0000
<span style='display:block; white-space:pre;color:#404040;'> py-tensorflow: Update c++ standard to 2014, fix build file patching
</span>---
python/py-tensorflow/Portfile | 19 ++++++++-----------
1 file changed, 8 insertions(+), 11 deletions(-)
<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 3639137..015486c 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;'>@@ -11,7 +11,7 @@ PortGroup xcode_workaround 1.0
</span>
name py-tensorflow
version 2.0.0
<span style='display:block; white-space:pre;background:#ffe0e0;'>-revision 0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+revision 1
</span> github.setup tensorflow tensorflow ${version} v
platforms darwin
supported_archs x86_64
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -40,8 +40,8 @@ if { ${os.major} < 16 } {
</span> }
compiler.blacklist-append {clang < 840}
<span style='display:block; white-space:pre;background:#ffe0e0;'>-# require c++11
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-compiler.cxx_standard 2011
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# require c++14
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+compiler.cxx_standard 2014
</span>
patch.pre_args -p1
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -98,12 +98,6 @@ if {${name} ne ${subport}} {
</span> port:py${python.version}-wheel \
port:py${python.version}-wrapt
<span style='display:block; white-space:pre;background:#ffe0e0;'>- if {${python.version} < 34} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- depends_lib-append \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- port:py${python.version}-backports.weakref \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- port:py${python.version}-enum34
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span> use_configure yes
# Options passed to configure script via env vars
configure.env-append PYTHON_LIB_PATH=${python.prefix}/lib/python${python.branch}/site-packages
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -133,7 +127,8 @@ if {${name} ne ${subport}} {
</span> # Patch configuration
pre-configure {
# enforce correct build settings
<span style='display:block; white-space:pre;background:#ffe0e0;'>- foreach f [ exec find ${worksrcpath} -name "*.tpl" -or -name "*.bzl" -or -name "CROSSTOOL" -or -name "configure.py" ] {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # note final / is because ${worksrcpath} is a sym-link
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ foreach f [ exec find ${worksrcpath}/ -name "configure" -or -name "configure.py" -or -name "compile.sh" -or -name "*.tpl" -or -name "*.bzl" -or -name "CROSSTOOL" -or -name "configure.py" -or -name "MOCK_CROSSTOOL" ] {
</span> foreach cmd {ar nm strip libtool ld objdump} {
reinplace -q "s|/usr/bin/${cmd}|${prefix}/bin/${cmd}|g" ${f}
}
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -142,10 +137,12 @@ if {${name} ne ${subport}} {
</span> reinplace -q "s| clang | ${configure.cc} |g" ${f}
reinplace -q "s|/usr/local/include|${prefix}/include|g" ${f}
reinplace -q "s|std=c++0x|std=c++11|g" ${f}
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ reinplace -q "s|std=c++1y|std=c++14|g" ${f}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ reinplace -q "s|std=c++1z|std=c++17|g" ${f}
</span> }
# If not native build, make sure not used...
if {![variant_isset native]} {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- foreach f [ exec find ${worksrcpath} -name "configure" -or -name "configure.py" -or -name "CMakeLists.txt" -or -name "Makefile" -or -name "*.sh" ] {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ foreach f [ exec find ${worksrcpath}/ -name "configure" -or -name "configure.py" -or -name "CMakeLists.txt" -or -name "Makefile" -or -name "*.sh" ] {
</span> reinplace -q "s|-march=native|${base_march}|g" ${f}
}
}
</pre><pre style='margin:0'>
</pre>