<pre style='margin:0'>
Ryan Schmidt (ryandesign) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/805cd044d8e54c39e05cb76375ec5aabc7ff1eb6">https://github.com/macports/macports-ports/commit/805cd044d8e54c39e05cb76375ec5aabc7ff1eb6</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 805cd04 lz4: Honor cxx_stdlib
</span>805cd04 is described below
<span style='display:block; white-space:pre;color:#808000;'>commit 805cd044d8e54c39e05cb76375ec5aabc7ff1eb6
</span>Author: Ryan Schmidt <ryandesign@macports.org>
AuthorDate: Fri Mar 9 16:33:43 2018 -0600
<span style='display:block; white-space:pre;color:#404040;'> lz4: Honor cxx_stdlib
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> See: https://trac.macports.org/ticket/55733
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> No revision increase because C++ is only used to build the gen_manual
</span><span style='display:block; white-space:pre;color:#404040;'> program, which is only used to build the manual. There is no change to
</span><span style='display:block; white-space:pre;color:#404040;'> installed files.
</span>---
archivers/lz4/Portfile | 31 ++++++++++++++++++++-----------
archivers/lz4/files/CXXFLAGS.patch | 20 ++++++++++++++++++++
2 files changed, 40 insertions(+), 11 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/archivers/lz4/Portfile b/archivers/lz4/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 4917e62..d74fac1 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/archivers/lz4/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/archivers/lz4/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -24,23 +24,32 @@ checksums rmd160 36baefbbae909b78e0689487f08f155875dfd196 \
</span> sha256 1fa905150eac093d93e29e6f3e732a5fcf61152a6fed8ac1b288efe568ecf760 \
size 228665
<span style='display:block; white-space:pre;background:#ffe0e0;'>-patchfiles-append parallel.patch
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+patchfiles-append CXXFLAGS.patch \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ parallel.patch
</span>
use_configure no
<span style='display:block; white-space:pre;background:#ffe0e0;'>-build.args-append PREFIX=${prefix}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-destroot.args-append PREFIX=${prefix}
</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.cxxflags-append -stdlib=${configure.cxx_stdlib}
</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;'>+build.args-append CC=${configure.cc} \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ CXX=${configure.cxx} \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ PREFIX=${prefix}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+destroot.args-append CC=${configure.cc} \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ CXX=${configure.cxx} \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ PREFIX=${prefix}
</span>
if { ![variant_isset universal] } {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- build.args-append CC="${configure.cc} [get_canonical_archflags cc]"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- destroot.args-append CC="${configure.cc} [get_canonical_archflags cc]"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- build.args-append CXX="${configure.cxx} [get_canonical_archflags cxx]"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- destroot.args-append CXX="${configure.cxx} [get_canonical_archflags cxx]"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ build.args-append CFLAGS="${configure.cflags} [get_canonical_archflags cc]" \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ CXXFLAGS="${configure.cxxflags} [get_canonical_archflags cxx]"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ destroot.args-append CFLAGS="${configure.cflags} [get_canonical_archflags cc]" \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ CXXFLAGS="${configure.cxxflags} [get_canonical_archflags cxx]"
</span> } else {
foreach arch ${configure.universal_archs} {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- lappend merger_build_args(${arch}) CC='${configure.cc} -arch ${arch}'
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- lappend merger_destroot_args(${arch}) CC='${configure.cc} -arch ${arch}'
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- lappend merger_build_args(${arch}) CXX='${configure.cxx} -arch ${arch}'
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- lappend merger_destroot_args(${arch}) CXX='${configure.cxx} -arch ${arch}'
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ lappend merger_build_args(${arch}) CFLAGS="${configure.cflags} -arch ${arch}" \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ CXXFLAGS="${configure.cxxflags} -arch ${arch}"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ lappend merger_destroot_args(${arch}) CFLAGS="${configure.cflags} -arch ${arch}" \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ CXXFLAGS="${configure.cxxflags} -arch ${arch}"
</span> }
}
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/archivers/lz4/files/CXXFLAGS.patch b/archivers/lz4/files/CXXFLAGS.patch
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 0000000..411ec13
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/archivers/lz4/files/CXXFLAGS.patch
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,20 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Honor CXXFLAGS
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+https://github.com/lz4/lz4/issues/482
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+https://github.com/lz4/lz4/commit/6c23f03b93608a444f8747940bca26708a58fa78
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- contrib/gen_manual/Makefile.orig
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ contrib/gen_manual/Makefile
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -30,10 +30,10 @@
</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><span style='display:block; white-space:pre;background:#e0ffe0;'>+-CFLAGS ?= -O3
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-CFLAGS += -Wall -Wextra -Wcast-qual -Wcast-align -Wshadow -Wstrict-aliasing=1 -Wswitch-enum -Wno-comment
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-CFLAGS += $(MOREFLAGS)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-FLAGS = $(CPPFLAGS) $(CFLAGS) $(LDFLAGS)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++CXXFLAGS ?= -O3
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++CXXFLAGS += -Wall -Wextra -Wcast-qual -Wcast-align -Wshadow -Wstrict-aliasing=1 -Wswitch-enum -Wno-comment
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++CXXFLAGS += $(MOREFLAGS)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++FLAGS = $(CPPFLAGS) $(CXXFLAGS) $(LDFLAGS)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ LZ4API = ../../lib/lz4.h
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ LZ4MANUAL = ../../doc/lz4_manual.html
</span></pre><pre style='margin:0'>
</pre>