<pre style='margin:0'>
Ken (kencu) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/a20a9af0e2a9de76cedad53c7d585d81c17db63c">https://github.com/macports/macports-ports/commit/a20a9af0e2a9de76cedad53c7d585d81c17db63c</a></p>
<pre style="white-space: pre; background: #F8F8F8"><span style='display:block; white-space:pre;color:#808000;'>commit a20a9af0e2a9de76cedad53c7d585d81c17db63c
</span>Author: Marcus Calhoun-Lopez <mcalhoun@macports.org>
AuthorDate: Sun Mar 27 11:58:50 2022 -0700
<span style='display:block; white-space:pre;color:#404040;'> isl: fix universal build
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> No revbump since port either builds correctly or not at all.
</span><span style='display:block; white-space:pre;color:#404040;'> Fixes https://trac.macports.org/ticket/64416
</span>---
devel/isl/Portfile | 7 ++++++-
devel/isl/files/patch-cross.diff | 11 +++++++++++
2 files changed, 17 insertions(+), 1 deletion(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/devel/isl/Portfile b/devel/isl/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index c35a3f641ab..1a3fdcf8470 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/devel/isl/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/devel/isl/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -2,7 +2,7 @@
</span>
PortSystem 1.0
PortGroup compiler_blacklist_versions 1.0
<span style='display:block; white-space:pre;background:#ffe0e0;'>-PortGroup muniversal 1.0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+PortGroup muniversal 1.1
</span>
name isl
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -44,6 +44,8 @@ checksums rmd160 b3bf8e1ad50207d4eebecc47cb4cffdac6581a57 \
</span>
configure.args --disable-silent-rules
<span style='display:block; white-space:pre;background:#e0ffe0;'>+triplet.add_build cross
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> test.run yes
test.target check
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -54,6 +56,9 @@ if {${subport} eq ${name}} {
</span> # be more strict about detecting C++11 for older compilers
patchfiles-append patch-configure_c++11.diff
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ # see https://groups.google.com/g/isl-development/c/Khx3_0g9Dzw
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ patchfiles-append patch-cross.diff
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> # ./include/isl/typed_cpp.h:2132:12: error: no matching conversion for functional-style cast from 'const isl::basic_set' to 'isl::typed::basic_set<>'
compiler.blacklist {clang < 500}
}
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/devel/isl/files/patch-cross.diff b/devel/isl/files/patch-cross.diff
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 00000000000..fc62d43583b
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/devel/isl/files/patch-cross.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,11 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- configure.orig 2021-04-26 02:13:19.000000000 -0700
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ configure 2022-03-12 10:45:30.000000000 -0700
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -4987,7 +4987,7 @@
</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;'>+-cross_compiling_build=no
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++cross_compiling_build=maybe
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ac_build_tool_prefix=
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if test -n "$build"; then :
</span></pre><pre style='margin:0'>
</pre>