<pre style='margin:0'>
Rainer Müller (raimue) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/c1fc39cd7aba48258c63583b0dada12e528d7e79">https://github.com/macports/macports-ports/commit/c1fc39cd7aba48258c63583b0dada12e528d7e79</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 c1fc39cd7ab py-brotli: Use MacPorts CXXFLAGS
</span>c1fc39cd7ab is described below
<span style='display:block; white-space:pre;color:#808000;'>commit c1fc39cd7aba48258c63583b0dada12e528d7e79
</span>Author: Ryan Schmidt <ryandesign@macports.org>
AuthorDate: Mon Oct 5 23:12:14 2020 -0500
<span style='display:block; white-space:pre;color:#404040;'> py-brotli: Use MacPorts CXXFLAGS
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> This ensures that it's using the right C++ standard library. Since it
</span><span style='display:block; white-space:pre;color:#404040;'> wasn't doing that before for 10.6-10.8, this changes the files on disk
</span><span style='display:block; white-space:pre;color:#404040;'> on those systems, so the revision is increased.
</span>---
python/py-brotli/Portfile | 7 +++----
python/py-brotli/files/CXXFLAGS.patch | 27 +++++++++++++++++++++++++++
2 files changed, 30 insertions(+), 4 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/python/py-brotli/Portfile b/python/py-brotli/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 783347e6713..79e9488fb58 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/python/py-brotli/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/python/py-brotli/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,12 +1,12 @@
</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
PortSystem 1.0
<span style='display:block; white-space:pre;background:#ffe0e0;'>-PortGroup compiler_blacklist_versions 1.0
</span> PortGroup github 1.0
PortGroup python 1.0
# keep this in sync with port brotli
github.setup google brotli 1.0.9 v
<span style='display:block; white-space:pre;background:#e0ffe0;'>+revision 1
</span> name py-brotli
categories python archivers
platforms darwin
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -27,14 +27,13 @@ checksums rmd160 3e2402d137fd75f898007d3730773b32025a4857 \
</span> sha256 b56a4371636e063ad3695f7c53aed5c18fc2303034564534981e7d6a11b75138 \
size 487046
<span style='display:block; white-space:pre;background:#ffe0e0;'>-# make sure it use libc++
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-compiler.blacklist {clang < 500}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span> python.versions 27 36 37 38
if {$subport ne $name} {
depends_build-append port:py${python.version}-setuptools
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ patchfiles CXXFLAGS.patch
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> test.run yes
livecheck.type none
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/python/py-brotli/files/CXXFLAGS.patch b/python/py-brotli/files/CXXFLAGS.patch
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 00000000000..3ff21f2dae5
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/python/py-brotli/files/CXXFLAGS.patch
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,27 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Honor MacPorts CXXFLAGS.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- setup.py.orig 2020-08-27 09:12:55.000000000 -0500
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ setup.py 2020-10-05 22:57:09.000000000 -0500
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -79,11 +79,15 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ cxx_sources.append(source)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ extra_args = ext.extra_compile_args or []
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ cxxflags = os.environ['CXXFLAGS'].split()
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ objects = []
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ for lang, sources in (('c', c_sources), ('c++', cxx_sources)):
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if lang == 'c++':
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if self.compiler.compiler_type == 'msvc':
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ extra_args.append('/EHsc')
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ else:
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ extra_args.extend(cxxflags)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ macros = ext.define_macros[:]
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if platform.system() == 'Darwin':
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -110,6 +114,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if ext.extra_objects:
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ objects.extend(ext.extra_objects)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ extra_args = ext.extra_link_args or []
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ extra_args.extend(cxxflags)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # when using GCC on Windows, we statically link libgcc and libstdc++,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # so that we don't need to package extra DLLs
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if self.compiler.compiler_type == 'mingw32':
</span></pre><pre style='margin:0'>
</pre>