<pre style='margin:0'>
NicosPavlov pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/11baf4ecb96c4d44bbd7fadaeef9d83e47eeac3c">https://github.com/macports/macports-ports/commit/11baf4ecb96c4d44bbd7fadaeef9d83e47eeac3c</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 11baf4e kdevplatform, kdevelop: use cxx11 portgroup, explicitly support c++11 in compilation (fix: https://trac.macports.org/ticket/55298)
</span>11baf4e is described below
<span style='display:block; white-space:pre;color:#808000;'>commit 11baf4ecb96c4d44bbd7fadaeef9d83e47eeac3c
</span>Author: Nicolas Pavillon <nicos@macports.org>
AuthorDate: Thu Nov 23 14:06:15 2017 +0900
<span style='display:block; white-space:pre;color:#404040;'> kdevplatform, kdevelop: use cxx11 portgroup, explicitly support c++11 in compilation (fix: https://trac.macports.org/ticket/55298)
</span>---
kde/kdevelop/Portfile | 11 +++++------
kde/kdevplatform/Portfile | 12 +++++-------
2 files changed, 10 insertions(+), 13 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/kde/kdevelop/Portfile b/kde/kdevelop/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 338b50b..bc80af4 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/kde/kdevelop/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/kde/kdevelop/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -4,9 +4,11 @@ PortSystem 1.0
</span> PortGroup kde4 1.1
PortGroup muniversal 1.0
PortGroup compiler_blacklist_versions 1.0
<span style='display:block; white-space:pre;background:#e0ffe0;'>+PortGroup cxx11 1.1
</span>
name kdevelop
version 4.7.4
<span style='display:block; white-space:pre;background:#e0ffe0;'>+revision 1
</span> categories kde kde4
platforms darwin
license GPL-2+
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -35,9 +37,6 @@ depends_lib-append port:kdelibs4 \
</span> port:kate \
port:oxygen-icons
<span style='display:block; white-space:pre;background:#ffe0e0;'>-compiler.blacklist-append {clang < 500}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-compiler.blacklist-append macports-llvm-gcc-4.2 llvm-gcc-4.2
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span> #Binaries do not link to openssl, nor use the ssl backend of kdelibs4
license_noconflict openssl
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -62,11 +61,11 @@ pre-configure {
</span> ${worksrcpath}/debuggers/gdb/printers/CMakeLists.txt
}
<span style='display:block; white-space:pre;background:#ffe0e0;'>-#Using c++0x for Lion and higher in case of clang 64-bit
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+#Using c++11 for Lion and higher in case of clang 64-bit
</span> if {${configure.compiler} eq "clang" && ${os.platform} eq "darwin" && ${os.major} >= 11} {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- lappend merger_configure_args(x86_64) -DCMAKE_CXX_FLAGS='-stdlib=libc++' -DHAVE_UNORDERED_MAP=1
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ lappend merger_configure_args(x86_64) -DCMAKE_CXX_FLAGS='-stdlib=libc++ -std=c++11' -DHAVE_UNORDERED_MAP=1
</span> if {${build_arch} eq "x86_64" && ![variant_isset universal]} {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- configure.args-append -DCMAKE_CXX_FLAGS="-stdlib=libc++" -DHAVE_UNORDERED_MAP=1
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure.args-append -DCMAKE_CXX_FLAGS="-stdlib=libc++ -std=c++11" -DHAVE_UNORDERED_MAP=1
</span> }
}
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/kde/kdevplatform/Portfile b/kde/kdevplatform/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 26e9b1a..9f4f480 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/kde/kdevplatform/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/kde/kdevplatform/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -4,10 +4,11 @@ PortSystem 1.0
</span> PortGroup kde4 1.1
PortGroup muniversal 1.0
PortGroup compiler_blacklist_versions 1.0
<span style='display:block; white-space:pre;background:#e0ffe0;'>+PortGroup cxx11 1.1
</span>
name kdevplatform
version 1.7.4
<span style='display:block; white-space:pre;background:#ffe0e0;'>-revision 1
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+revision 2
</span> categories kde kde4
platforms darwin
license GPL-2+
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -35,9 +36,6 @@ depends_lib-append port:kdelibs4 \
</span> port:grantlee \
port:sparsehash
<span style='display:block; white-space:pre;background:#ffe0e0;'>-compiler.blacklist-append {clang < 500}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-compiler.blacklist-append macports-llvm-gcc-4.2 llvm-gcc-4.2
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span> #Binaries do not link to openssl, nor use the ssl backend of kdelibs4
license_noconflict openssl
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -55,10 +53,10 @@ if {${configure.compiler} ne "clang"} {
</span> #Adding -fexceptions, required by gcc compilers
patchfiles-append patch-languageCMakeLists.diff
} elseif {${os.platform} eq "darwin" && ${os.major} >= 11} {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- #Using c++0x for Lion and higher in case of clang 64-bit
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- lappend merger_configure_args(x86_64) -DCMAKE_CXX_FLAGS='-stdlib=libc++' -DHAVE_UNORDERED_MAP=1
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #Using c++11 for Lion and higher in case of clang 64-bit
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ lappend merger_configure_args(x86_64) -DCMAKE_CXX_FLAGS='-stdlib=libc++ -std=c++11' -DHAVE_UNORDERED_MAP=1
</span> if {${build_arch} eq "x86_64" && ![variant_isset universal]} {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- configure.args-append -DCMAKE_CXX_FLAGS="-stdlib=libc++" -DHAVE_UNORDERED_MAP=1
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure.args-append -DCMAKE_CXX_FLAGS="-stdlib=libc++ -std=c++11" -DHAVE_UNORDERED_MAP=1
</span> }
}
</pre><pre style='margin:0'>
</pre>