<pre style='margin:0'>
Christopher Nielsen (mascguy) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/f931cfa55254ec9928d5b9a7103f11cca7b68f35">https://github.com/macports/macports-ports/commit/f931cfa55254ec9928d5b9a7103f11cca7b68f35</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 f931cfa5525 py-grpcio*: patch to fix C compiler handling
</span>f931cfa5525 is described below
<span style='display:block; white-space:pre;color:#808000;'>commit f931cfa55254ec9928d5b9a7103f11cca7b68f35
</span>Author: Christopher Nielsen <mascguy@github.com>
AuthorDate: Thu Aug 17 18:13:56 2023 -0400
<span style='display:block; white-space:pre;color:#404040;'> py-grpcio*: patch to fix C compiler handling
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> Fixes: https://trac.macports.org/ticket/62208
</span>---
devel/grpc/Portfile | 7 ++++++-
devel/grpc/files/patch-python-respect-cc-variable.diff | 18 ++++++++++++++++++
2 files changed, 24 insertions(+), 1 deletion(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/devel/grpc/Portfile b/devel/grpc/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 2e52300f151..12ae1774d6b 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/devel/grpc/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/devel/grpc/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -31,6 +31,11 @@ set name_io ${name}io
</span> # https://trac.macports.org/ticket/65525#comment:1
patchfiles-append patch-unbreak-port_platform.diff
<span style='display:block; white-space:pre;background:#e0ffe0;'>+# Python: upstream patch to ensure env var 'CC' is utilized. Fixed in v1.52.0 and beyond.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# https://trac.macports.org/ticket/62208
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# https://github.com/grpc/grpc/pull/26480
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+patchfiles-append patch-python-respect-cc-variable.diff
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> # error: constexpr function never produces a constant expression
# Requires c++17 support
compiler.cxx_standard 2017
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -189,7 +194,7 @@ foreach v ${python_versions} {
</span>
# common settings for all Python ports
if {[string match "py*" ${subport}]} {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- patch {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ pre-patch {
</span> reinplace "s|/usr|${prefix}|g" ${worksrcpath}/setup.py
}
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/devel/grpc/files/patch-python-respect-cc-variable.diff b/devel/grpc/files/patch-python-respect-cc-variable.diff
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 00000000000..8f9d1b90e3c
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/devel/grpc/files/patch-python-respect-cc-variable.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,18 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+#========================================================================================
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# From 31fc452b68e429c029f00b5fcc54292a303be0c6 Mon Sep 17 00:00:00 2001
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# From: Georgy Yakovlev <168902+gyakovlev@users.noreply.github.com>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# Date: Mon, 28 Nov 2022 15:07:36 -0800
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# Subject: [PATCH] respect CC variable (#26480)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+#========================================================================================
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- src/python/grpcio/commands.py
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ src/python/grpcio/commands.py
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -228,7 +228,8 @@ def compiler_ok_with_extra_std():
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ """
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ try:
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # TODO(lidiz) Remove the generated a.out for success tests.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- cc_test = subprocess.Popen(['cc', '-x', 'c', '-std=c++14', '-'],
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ cc = os.environ.get('CC', 'cc')
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ cc_test = subprocess.Popen([cc, '-x', 'c', '-std=c++14', '-'],
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ stdin=subprocess.PIPE,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ stdout=subprocess.PIPE,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ stderr=subprocess.PIPE)
</span></pre><pre style='margin:0'>
</pre>