<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/c4d78333621dc07a768a11b8a495748d608754bb">https://github.com/macports/macports-ports/commit/c4d78333621dc07a768a11b8a495748d608754bb</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 c4d78333621 py-meson,meson: do not add CXXflag for C compiler
</span>c4d78333621 is described below
<span style='display:block; white-space:pre;color:#808000;'>commit c4d78333621dc07a768a11b8a495748d608754bb
</span>Author: Renee Otten <reneeotten@macports.org>
AuthorDate: Fri May 16 13:09:01 2025 -0400
<span style='display:block; white-space:pre;color:#404040;'> py-meson,meson: do not add CXXflag for C compiler
</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/71165
</span><span style='display:block; white-space:pre;color:#404040;'> Closes: #26300
</span>---
devel/meson/Portfile | 2 +-
python/py-meson/Portfile | 5 ++++-
python/py-meson/files/patch-meson-appleframeworks.diff | 14 ++++++++++++++
3 files changed, 19 insertions(+), 2 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/devel/meson/Portfile b/devel/meson/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 4930c625946..932ce279b8d 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/devel/meson/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/devel/meson/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -4,7 +4,7 @@ PortSystem 1.0
</span>
name meson
version 1.8.0
<span style='display:block; white-space:pre;background:#ffe0e0;'>-revision 0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+revision 1
</span>
license Apache-2
categories-prepend devel
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/python/py-meson/Portfile b/python/py-meson/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 27e7925274e..a1ea46191f1 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/python/py-meson/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/python/py-meson/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -8,7 +8,7 @@ name py-meson
</span> # update version and revision also in the meson port
github.setup mesonbuild meson 1.8.0
github.tarball_from releases
<span style='display:block; white-space:pre;background:#ffe0e0;'>-revision 0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+revision 1
</span>
checksums rmd160 d29fd5364610e7ec3e9d615d76759c99e6610af0 \
sha256 0a9b23311271519bd03dca12d7d8b0eab582c3a2c5da433d465b6e519dc88e2f \
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -74,6 +74,9 @@ if {${subport} ne ${name}} {
</span> # add a search path for crossfiles in our prefix
patchfiles-append patch-meson-search-prefix-for-cross-files.diff
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ # see: https://trac.macports.org/ticket/71165
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ patchfiles-append patch-meson-appleframeworks.diff
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> platform darwin 8 {
github.setup mesonbuild meson 1.6.1
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/python/py-meson/files/patch-meson-appleframeworks.diff b/python/py-meson/files/patch-meson-appleframeworks.diff
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 00000000000..559f56541fe
</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-meson/files/patch-meson-appleframeworks.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,14 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+See: https://trac.macports.org/ticket/71165
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Upstream did not accept this solution nor provided other useful comments and/or fix.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- mesonbuild/compilers/mixins/clike.py.orig
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ mesonbuild/compilers/mixins/clike.py
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -1191,7 +1191,8 @@ def find_framework_paths(self, env: 'Environment') -> T.List[str]:
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ commands = self.get_exelist(ccache=False) + ['-v', '-E', '-']
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ commands += self.get_always_args()
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # Add CFLAGS/CXXFLAGS/OBJCFLAGS/OBJCXXFLAGS from the env
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- commands += env.coredata.get_external_args(self.for_machine, self.language)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ # 'std=c++<ver>','std=gnu++<ver>' are valid for C++/ObjC++ but not for 'C'
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ commands += [x for x in env.coredata.get_external_args(self.for_machine, self.language) if '-std=c++' not in x and '-std=gnu++' not in x]
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ mlog.debug('Finding framework path by running: ', ' '.join(commands), '\n')
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ os_env = os.environ.copy()
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ os_env['LC_ALL'] = 'C'
</span></pre><pre style='margin:0'>
</pre>