<pre style='margin:0'>
Perry E. Metzger (pmetzger) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/1336523b795e9199f2db59840c4dd1fc3be66c92">https://github.com/macports/macports-ports/commit/1336523b795e9199f2db59840c4dd1fc3be66c92</a></p>
<pre style="white-space: pre; background: #F8F8F8"><span style='display:block; white-space:pre;color:#808000;'>commit 1336523b795e9199f2db59840c4dd1fc3be66c92
</span>Author: Sergey Fedorov <barracuda@macos-powerpc.org>
AuthorDate: Fri Jul 26 10:56:10 2024 +0800
<span style='display:block; white-space:pre;color:#404040;'> asl: fix threads variant for gcc
</span>---
math/asl/Portfile | 28 ++++++++++++++++++++--------
1 file changed, 20 insertions(+), 8 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/math/asl/Portfile b/math/asl/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 72f4d5b170f..1627ab6ee22 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/math/asl/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/math/asl/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -26,20 +26,32 @@ configure.args-append -DBUILD_SHARED_LIBS=ON \
</span> -DBUILD_CPP=ON
variant threads description {builds multithreaded libraries, compiled using OpenMP switches} {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- depends_lib-append port:libomp
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ compiler.openmp_version 2.5
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if {[string match *clang* ${configure.compiler}]} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ depends_lib-append port:libomp
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure.cflags-append -I${prefix}/include/libomp
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure.ldflags-append \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -L${prefix}/lib/libomp -lomp
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ } elseif {[string match *gcc* ${configure.compiler}]} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # The build fails to add needed flags automatically:
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # https://github.com/ampl/asl/issues/17
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure.cflags-append -fopenmp
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure.ldflags-append \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -fopenmp
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span>
configure.args-append -DBUILD_MT_LIBS=ON
<span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- configure.cflags-append -I${prefix}/include/libomp
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- configure.ldflags-append -L${prefix}/lib/libomp -lomp
</span> }
<span style='display:block; white-space:pre;background:#ffe0e0;'>-# libomp aren't available on PowerPC
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-if {${build_arch} ni [list ppc ppc64]} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- default_variants-append +threads
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# cc1: error: unrecognized command line option "-Wno-unused-result"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# arith.h: error: expected ‘=’, ‘,’, ‘;’, ‘asm’ or ‘__attribute__’ before ‘byte’
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+compiler.blacklist-append *gcc-4.0 *gcc-4.2
</span>
# PowerPC support should be enabled manually
if {${build_arch} in [list ppc ppc64]} {
configure.args-append -Dppc_support=ON
}
<span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+default_variants-append +threads
</span></pre><pre style='margin:0'>
</pre>