<pre style='margin:0'>
Renee Otten (reneeotten) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/a8942dd3d32dd4781819e3538ad1ee23269c197d">https://github.com/macports/macports-ports/commit/a8942dd3d32dd4781819e3538ad1ee23269c197d</a></p>
<pre style="white-space: pre; background: #F8F8F8"><span style='display:block; white-space:pre;color:#808000;'>commit a8942dd3d32dd4781819e3538ad1ee23269c197d
</span>Author: Renee Otten <reneeotten@macports.org>
AuthorDate: Sat May 8 23:30:31 2021 -0400
<span style='display:block; white-space:pre;color:#404040;'> py-matplotlib: respect MP CXXFLAGS
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> Closes: https://trac.macports.org/ticket/62665
</span>---
python/py-matplotlib/Portfile | 12 ++-
python/py-matplotlib/files/patch-v34-setupext.py | 104 +++++++++++++++++++++++
2 files changed, 114 insertions(+), 2 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/python/py-matplotlib/Portfile b/python/py-matplotlib/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index d32d8a15687..39eea09a4c1 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/python/py-matplotlib/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/python/py-matplotlib/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -50,7 +50,8 @@ if {${name} ne ${subport}} {
</span> port:py${python.version}-Pillow
patchfiles patch-v34-setup.cfg.diff \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- patch-v34-src-macosx.m.diff
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ patch-v34-src-macosx.m.diff \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ patch-v34-setupext.py
</span>
if {${python.version} eq 27} {
version 2.2.5
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -101,7 +102,14 @@ if {${name} ne ${subport}} {
</span> port:py${python.version}-certifi
}
<span style='display:block; white-space:pre;background:#ffe0e0;'>- build.env PKG_CONFIG_PATH=${python.prefix}/lib/pkgconfig
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ build.env-append \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ PKG_CONFIG_PATH=${python.prefix}/lib/pkgconfig \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ CFLAGS=${configure.cxxflags} \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ CXXFLAGS=${configure.cxxflags} \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ destroot.env-append \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ PKG_CONFIG_PATH=${python.prefix}/lib/pkgconfig \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ CFLAGS=${configure.cxxflags} \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ CXXFLAGS=${configure.cxxflags} \
</span>
# build fails with gcc-4.0 on Leopard, use gcc-4.2 (#37069)
compiler.blacklist gcc-4.0
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/python/py-matplotlib/files/patch-v34-setupext.py b/python/py-matplotlib/files/patch-v34-setupext.py
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 00000000000..3fc7ce6e458
</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-matplotlib/files/patch-v34-setupext.py
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,104 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- setupext.py.orig 2021-05-09 11:35:25.000000000 -0400
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ setupext.py 2021-05-09 11:35:29.000000000 -0400
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -381,6 +381,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ "src/_backend_agg_wrapper.cpp",
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ])
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ add_numpy_flags(ext)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ add_macports_flags(ext)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ add_libagg_flags_and_sources(ext)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ FreeType.add_flags(ext)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ yield ext
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -391,6 +392,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ "linux": ["dl"],
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ "win32": ["ole32", "shell32", "user32"],
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }.get(sys.platform, [])))
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ add_macports_flags(ext)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ yield ext
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # contour
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ext = Extension(
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -400,6 +402,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ "src/py_converters.cpp",
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ])
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ add_numpy_flags(ext)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ add_macports_flags(ext)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ add_libagg_flags(ext)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ yield ext
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # ft2font
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -412,6 +415,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ])
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ FreeType.add_flags(ext)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ add_numpy_flags(ext)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ add_macports_flags(ext)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ add_libagg_flags(ext)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ yield ext
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # image
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -423,6 +427,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ "src/py_converters.cpp",
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ])
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ add_numpy_flags(ext)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ add_macports_flags(ext)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ add_libagg_flags_and_sources(ext)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ yield ext
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # path
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -432,6 +437,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ "src/_path_wrapper.cpp",
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ])
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ add_numpy_flags(ext)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ add_macports_flags(ext)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ add_libagg_flags_and_sources(ext)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ yield ext
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # qhull
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -439,6 +445,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ "matplotlib._qhull", ["src/qhull_wrap.c"],
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ define_macros=[("MPL_DEVNULL", os.devnull)])
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ add_numpy_flags(ext)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ add_macports_flags(ext)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ Qhull.add_flags(ext)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ yield ext
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # tkagg
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -452,6 +459,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ "cygwin": ["psapi"]}.get(sys.platform, [])),
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ extra_link_args={"win32": ["-mwindows"]}.get(sys.platform, []))
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ add_numpy_flags(ext)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ add_macports_flags(ext)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ add_libagg_flags(ext)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ yield ext
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # tri
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -462,6 +470,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ "src/mplutils.cpp",
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ])
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ add_numpy_flags(ext)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ add_macports_flags(ext)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ yield ext
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # ttconv
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ext = Extension(
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -473,9 +482,11 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ],
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ include_dirs=["extern"])
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ add_numpy_flags(ext)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ add_macports_flags(ext)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ yield ext
</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;'>+ class Tests(OptionalPackage):
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ name = "tests"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ default_config = False
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -494,6 +505,11 @@
</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;'>++def add_macports_flags(ext):
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ mp_cxxflags = os.getenv('CXXFLAGS').split()
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ print(f"MacPorts CXXFLAGS = {mp_cxxflags}")
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ ext.extra_compile_args.extend(mp_cxxflags)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ def add_numpy_flags(ext):
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ import numpy as np
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ext.include_dirs.append(np.get_include())
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -706,4 +722,5 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ext.extra_link_args.extend(['-framework', 'Cocoa'])
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if platform.python_implementation().lower() == 'pypy':
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ext.extra_compile_args.append('-DPYPY=1')
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ add_macports_flags(ext)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ yield ext
</span></pre><pre style='margin:0'>
</pre>