<pre style='margin:0'>
Christopher Nielsen (mascguy) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/94a406552293645e2b775cf17441ae5e65115455">https://github.com/macports/macports-ports/commit/94a406552293645e2b775cf17441ae5e65115455</a></p>
<pre style="white-space: pre; background: #F8F8F8"><span style='display:block; white-space:pre;color:#808000;'>commit 94a406552293645e2b775cf17441ae5e65115455
</span>Author: Steven Thomas Smith <s.t.smith@ieee.org>
AuthorDate: Mon Jul 18 06:23:38 2022 -0400
<span style='display:block; white-space:pre;color:#404040;'> bazel: Bugfix, Update to version 6.1.1
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> * Fixes: https://trac.macports.org/ticket/64442
</span>---
devel/bazel/Portfile | 197 ++++++++++++++++++++-------------------------------
1 file changed, 76 insertions(+), 121 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/devel/bazel/Portfile b/devel/bazel/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 9c0205d736b..7e457d46f7b 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/devel/bazel/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/devel/bazel/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,17 +1,17 @@
</span> # -*- coding: utf-8; mode: tcl; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- vim:fenc=utf-8:ft=tcl:et:sw=4:ts=4:sts=4
<span style='display:block; white-space:pre;background:#ffe0e0;'>-PortSystem 1.0
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-PortGroup github 1.0
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-PortGroup java 1.0
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-PortGroup compiler_blacklist_versions 1.0
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-PortGroup legacysupport 1.1
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+PortSystem 1.0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+PortGroup github 1.0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+PortGroup java 1.0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+PortGroup compiler_blacklist_versions 1.0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+PortGroup legacysupport 1.1
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>-legacysupport.use_static yes
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-legacysupport.newest_darwin_requires_legacy 13
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+legacysupport.use_static yes
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+legacysupport.newest_darwin_requires_legacy 13
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>-epoch 1
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+epoch 1
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>-# List of all bazel sub-ports ( e.g. as required by tensorflow )
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# List of all bazel sub-ports ( now obsolete )
</span> set bazel_subports {bazel-0.25 bazel-2.0 bazel-3.1 bazel-3.5 bazel-3.7}
set all_bazels ${bazel_subports}
lappend all_bazels bazel
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -29,115 +29,66 @@ set extra_args ""
</span> # Note bazel-3.{1,5,7} build on OSX10.11 but fail at runtime with
# dyld: lazy symbol binding failed: Symbol not found: _os_log_create
<span style='display:block; white-space:pre;background:#e0ffe0;'>+set min_darwin 16
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> if { ${name} eq ${subport} } {
# Main port
<span style='display:block; white-space:pre;background:#ffe0e0;'>- github.setup bazelbuild ${name} 4.2.2
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- revision 0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ github.setup bazelbuild ${name} 6.1.2
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ revision 0
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>- checksums rmd160 9616833d5b2be2181bdb4dc05d8064d89017051d \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 9981d0d53a356c4e87962847750a97c9e8054e460854748006c80f0d7e2b2d33 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- size 279304631
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ checksums rmd160 2269ab0e20b84ce29c2ca83ee10b32fb17247cc5 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 6fb3ee22fe9fa86d82e173572d504c089f10825d749725592626e090b38c9679 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ size 194649137
</span>
set bazel_min_xcode 12.0
compiler.blacklist-append {clang < 1200}
compiler.blacklist-append {macports-clang-[5-9].0}
<span style='display:block; white-space:pre;background:#ffe0e0;'>- set min_darwin 16
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span> } elseif { "bazel-3.7" eq ${subport} } {
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ PortGroup obsolete 1.0
</span>
# Specific version for py-tensorflow - DO NOT CHANGE
<span style='display:block; white-space:pre;background:#ffe0e0;'>- github.setup bazelbuild ${name} 3.7.2
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- revision 1
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # livecheck none is correct here, see above.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- livecheck.type none
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- checksums rmd160 abf23b277194854bbd4e4390ab6b3f971d26826c \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 de255bb42163a915312df9f4b86e5b874b46d9e8d4b72604b5123c3a845ed9b1 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- size 313677756
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- compiler.blacklist-append {clang < 710}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- compiler.blacklist-append {macports-clang-[7-9].0}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- set min_darwin 16
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ github.setup bazelbuild ${name} 3.7.2
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ revision 2
</span>
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ # Obsolete Date: 2023-08-01
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ replaced_by bazel
</span> } elseif { "bazel-3.5" eq ${subport} } {
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ PortGroup obsolete 1.0
</span>
# Specific version for py-tensorflow - DO NOT CHANGE
<span style='display:block; white-space:pre;background:#ffe0e0;'>- github.setup bazelbuild ${name} 3.5.1
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- revision 1
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # livecheck none is correct here, see above.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- livecheck.type none
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- checksums rmd160 8c52fab5214d862b83459f807c39ae392db49a75 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 67eae714578b22d24192b0eb3a2d35b07578bbd57a33c50f1e74f8acd6378b3c \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- size 307982168
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- compiler.blacklist-append {clang < 710}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- compiler.blacklist-append {macports-clang-[7-9].0}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- set min_darwin 16
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- supported_archs x86_64
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # https://trac.macports.org/ticket/62551
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- set extra_args "--host_javabase=@local_jdk//:jdk"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ github.setup bazelbuild ${name} 3.5.1
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ revision 2
</span>
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ # Obsolete Date: 2023-08-01
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ replaced_by bazel
</span> } elseif { "bazel-3.1" eq ${subport} } {
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ PortGroup obsolete 1.0
</span>
# Specific version for py-tensorflow - DO NOT CHANGE
<span style='display:block; white-space:pre;background:#ffe0e0;'>- github.setup bazelbuild ${name} 3.1.0
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- revision 1
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # livecheck none is correct here, see above.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- livecheck.type none
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- checksums rmd160 b3238d0539e757a2a7b07f2e4475f1cefdc6307c \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 d7f40d0cac95a06cea6cb5b7f7769085257caebc3ee84269dd9298da760d5615 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- size 269384742
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- compiler.blacklist-append {clang < 710}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- compiler.blacklist-append {macports-clang-[7-9].0}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- set min_darwin 16
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- supported_archs x86_64
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # https://trac.macports.org/ticket/62551
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- set extra_args "--host_javabase=@local_jdk//:jdk"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ github.setup bazelbuild ${name} 3.1.0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ revision 2
</span>
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ # Obsolete Date: 2023-08-01
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ replaced_by bazel
</span> } elseif { "bazel-2.0" eq ${subport} } {
<span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # Specific version for py-tensorflow - DO NOT CHANGE
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- github.setup bazelbuild ${name} 2.0.0
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- revision 1
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # livecheck none is correct here, see above.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- livecheck.type none
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- checksums rmd160 acf9b886d2ec69f2c7019037e3aeba6de48cb011 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 724da3c656f68e787a86ebb9844773aa1c2e3a873cc39462a8f1b336153d6cbb \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- size 259625808
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ PortGroup obsolete 1.0
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>- compiler.blacklist-append {clang < 710}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- compiler.blacklist-append {macports-clang-[7-9].0}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- set min_darwin 16
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- supported_archs x86_64
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # Specific version for py-tensorflow - DO NOT CHANGE
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ github.setup bazelbuild ${name} 2.0.0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ revision 2
</span>
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ # Obsolete Date: 2023-08-01
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ replaced_by bazel
</span> } elseif { "bazel-0.25" eq ${subport} } {
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ PortGroup obsolete 1.0
</span>
# Specific version for py-tensorflow1 - DO NOT CHANGE
<span style='display:block; white-space:pre;background:#ffe0e0;'>- github.setup bazelbuild ${name} 0.25.2
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- revision 2
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # livecheck none is correct here, see above.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- livecheck.type none
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- checksums rmd160 cfff49a4be85f7693ae615c293b13d0a447b80d7 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 7456032199852c043e6c5b3e4c71dd8089c1158f72ec554e6ec1c77007f0ab51 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- size 275804130
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- compiler.blacklist-append {clang < 710}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- compiler.blacklist-append {macports-clang-[7-9].0}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- set min_darwin 14
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ github.setup bazelbuild ${name} 0.25.2
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ revision 3
</span>
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ # Obsolete Date: 2023-08-01
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ replaced_by bazel
</span> }
# exclude pre-release versions
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -154,39 +105,39 @@ if { ${os.platform} eq "darwin" && ${os.major} < ${min_darwin} } {
</span> }
# Required java version.
<span style='display:block; white-space:pre;background:#ffe0e0;'>-java.version 11
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+java.version 11
</span> # LTS JDK port to install if required java not found
<span style='display:block; white-space:pre;background:#ffe0e0;'>-java.fallback openjdk11
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+java.fallback openjdk11
</span> # JDK only needed at build time, but java PG sets lib dependency so
# declare no conflict to allow redistribution of binaries.
<span style='display:block; white-space:pre;background:#ffe0e0;'>-license_noconflict ${java.fallback}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+license_noconflict ${java.fallback}
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>-github.tarball_from releases
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+github.tarball_from releases
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>-categories devel
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+categories devel
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>-maintainers {tfmnet.com:mohamed.issa @missa-prime} \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- openmaintainer
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+maintainers {tfmnet.com:mohamed.issa @missa-prime} \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ openmaintainer
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>-description A tool for automating builds and tests.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-long_description {*}${description}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+description A tool for automating builds and tests.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+long_description {*}${description}
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>-platforms darwin
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-license Apache-2
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+platforms darwin
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+license Apache-2
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>-distname ${distname}-dist
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+distname ${distname}-dist
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>-use_zip yes
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-extract.mkdir yes
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+use_zip yes
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+extract.mkdir yes
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>-use_configure no
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+use_configure no
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>-patch.pre_args -p1
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+patch.pre_args -p1
</span>
# Even though bazel can build without Xcode, mark use Xcode for now since it fails to
# build with tracemode on latest master if both CLT and Xcode are available.
# Better solution is to respect MacPorts environment configure.developer_dir
<span style='display:block; white-space:pre;background:#ffe0e0;'>-use_xcode yes
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+use_xcode yes
</span>
compiler.cxx_standard 2011
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -197,11 +148,12 @@ configure.sdk_version
</span> set py3ver 3.10
set py2ver 2.7
<span style='display:block; white-space:pre;background:#ffe0e0;'>-depends_lib-append port:cctools
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+depends_lib-append port:cctools
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>-depends_build-append bin:zip:zip \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- port:python[string map {. {}} ${py2ver}] \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- port:python[string map {. {}} ${py3ver}]
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+depends_build-append \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ bin:zip:zip \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:python[string map {. {}} ${py2ver}] \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:python[string map {. {}} ${py3ver}]
</span>
post-extract {
# Make dir with selected MP 'python2' and 'python3' and add to PATH during build below
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -260,7 +212,7 @@ post-patch {
</span> set wrapdir [bazel_wrap_dir]
xinstall -m 755 -d ${wrapdir}
foreach comp {cc cxx} {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- set f [ open ${wrapdir}/${comp} w 0755 ]
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set f [ open ${wrapdir}/${comp}_bazelwrap w 0755 ]
</span> puts ${f} "#!/bin/bash"
puts ${f} "export CCACHE_DIR=[bazel_get_ccache_dir]"
set bzflags "\"\$\{\@\}\""
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -276,8 +228,8 @@ post-patch {
</span> }
foreach f [ exec find ${workpath}/ -name "wrapped_clang.cc" ] {
# Switch to selected compiler
<span style='display:block; white-space:pre;background:#ffe0e0;'>- reinplace -q "s|\"clang++\"|\"${wrapdir}/cxx\"|g" ${f}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- reinplace -q "s|\"clang\"|\"${wrapdir}/cc\"|g" ${f}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ reinplace -q "s|\"clang++\"|\"cxx_bazelwrap\"|g" ${f}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ reinplace -q "s|\"clang\"|\"cc_bazelwrap\"|g" ${f}
</span> # Bazel **really** doesn't want you changing stuff ;)
# https://stackoverflow.com/questions/47775668/bazel-how-to-skip-corrupt-installation-on-centos6
system "touch -m -t 210012120101 ${f}"
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -286,10 +238,11 @@ post-patch {
</span>
set wrapdir [bazel_wrap_dir]
<span style='display:block; white-space:pre;background:#ffe0e0;'>-build.env-append CC=${wrapdir}/cc \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- CXX=${wrapdir}/cxx \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+build.env-append CC=${wrapdir}/cc_bazelwrap \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ CXX=${wrapdir}/cxx_bazelwrap \
</span> TMPDIR=${workpath}/tmp \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- JAVA_HOME=${java.home}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ JAVA_HOME=${java.home} \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ PATH=${wrapdir}:$env(PATH)
</span>
proc use_external_toolchain {} {
# global configure.compiler xcodeversion bazel_min_xcode os.major
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -317,7 +270,7 @@ if { ${extra_args} ne "" } {
</span> }
variant bash_completion {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- depends_build-append bin:bash:bash
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ depends_build-append bin:bash:bash
</span> }
build {
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -334,7 +287,7 @@ build {
</span> }
# Build bazel
<span style='display:block; white-space:pre;background:#ffe0e0;'>- set bazel_cmd "PATH=${workpath}/bin:\$PATH JAVA_HOME=${java.home} VERBOSE=yes BAZEL_WRKDIR=${workpath} ./compile.sh"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set bazel_cmd "PATH=${wrapdir}:${workpath}/bin:\$PATH JAVA_HOME=${java.home} VERBOSE=yes BAZEL_WRKDIR=${workpath} ./compile.sh"
</span> # If using MP toolchain pass options to enforce this
if { [use_external_toolchain] } {
set bazel_cmd "BAZEL_USE_CPP_ONLY_TOOLCHAIN=1 ${bazel_cmd}"
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -391,7 +344,6 @@ post-destroot {
</span> CHANGELOG.md \
CONTRIBUTING.md \
CONTRIBUTORS \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- ISSUE_TEMPLATE.md \
</span> LICENSE \
README.md \
${destroot}${docdir}
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -410,4 +362,7 @@ post-destroot {
</span>
notes "
See http://bazel.build/docs/getting-started.html to start a new project!
<span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+MacPorts bazel uses the compilers `cxx_bazelwrap` and `cc_bazelwrap`; set\
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+these in the project path prior to building. See, e.g. PG bazel-1.0.tcl.
</span> "
</pre><pre style='margin:0'>
</pre>