<pre style='margin:0'>
Aljaž Srebrnič (g5pw) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/214e384ae21682a49e5f4310256bb641dac39bb3">https://github.com/macports/macports-ports/commit/214e384ae21682a49e5f4310256bb641dac39bb3</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 214e384 ostinato: fix build against protobuf3-cpp
</span>214e384 is described below
<span style='display:block; white-space:pre;color:#808000;'>commit 214e384ae21682a49e5f4310256bb641dac39bb3
</span>Author: Ken Cunningham <kencu@macports.org>
AuthorDate: Thu Aug 23 09:53:08 2018 -0700
<span style='display:block; white-space:pre;color:#404040;'> ostinato: fix build against protobuf3-cpp
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> requires -std=c++11 & cxx11 1.1 PG
</span><span style='display:block; white-space:pre;color:#404040;'> qmake PG facilitates this
</span><span style='display:block; white-space:pre;color:#404040;'> requires minor changes in Portfile wrt destrooting
</span>---
net/ostinato/Portfile | 34 +++++++++++++++++++++++-----------
1 file changed, 23 insertions(+), 11 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/net/ostinato/Portfile b/net/ostinato/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 5c5aa54..33e604c 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/net/ostinato/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/net/ostinato/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,11 +1,12 @@
</span> # -*- coding: utf-8; mode: tcl; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- vim:fenc=utf-8:ft=portfile:et:sw=4:ts=4:sts=4
PortSystem 1.0
<span style='display:block; white-space:pre;background:#ffe0e0;'>-PortGroup qt4 1.0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+PortGroup qmake 1.0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+PortGroup cxx11 1.1
</span> PortGroup github 1.0
github.setup pstavirs ostinato 0.9 v
<span style='display:block; white-space:pre;background:#ffe0e0;'>-revision 1
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+revision 2
</span> maintainers {g5pw @g5pw} openmaintainer
license GPL-3+
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -22,18 +23,29 @@ depends_lib port:qt4-mac \
</span> port:protobuf3-cpp
checksums rmd160 e1984c471120a37ebe064ddb09df058a19c7481b \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 569172cac35a104d5c670304e11c2eec6dfa99f2786130da780173023bf6a56f
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 569172cac35a104d5c670304e11c2eec6dfa99f2786130da780173023bf6a56f \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ size 413820
</span>
worksrcdir ${name}-${version}
<span style='display:block; white-space:pre;background:#ffe0e0;'>-post-patch {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- reinplace "s|/Applications/|${applications_dir}|" ${worksrcpath}/install.pri
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# doesn't build with clang-3.9 in c++11 mode
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# pcaptxthread.cpp:471:25: error: expected ')'
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# other clangs appear to work (3.4, 4.0, 6.0 tested)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+compiler.blacklist-append macports-clang-3.9
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# protobuf3-cpp requires c++11
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+configure.cxxflags-append -std=c++11
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# force protobuf3-cpp into the no_threadlocal mode
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+if { ${os.platform} eq "darwin" && ${os.major} < 11 } {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure.cxxflags-append -DGOOGLE_PROTOBUF_NO_THREADLOCAL
</span> }
<span style='display:block; white-space:pre;background:#ffe0e0;'>-# As per install instructions
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-configure.cmd qmake
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-configure.pre_args -spec macx-g++
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# qmake is not automatically passing in the stdlib on link
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+if {[string match *clang* ${configure.cxx}]} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure.ldflags-append -stdlib=${configure.cxx_stdlib}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+}
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>-# qmake doesn't recognize the --disable-dependency-tracking flag
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-configure.universal_args-delete \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- --disable-dependency-tracking
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+post-destroot {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ move ${destroot}${prefix}/Ostinato ${destroot}${applications_dir}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+}
</span></pre><pre style='margin:0'>
</pre>