<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/d86e7e1adc21d0aa50370306f404253350dd93fb">https://github.com/macports/macports-ports/commit/d86e7e1adc21d0aa50370306f404253350dd93fb</a></p>
<pre style="white-space: pre; background: #F8F8F8"><span style='display:block; white-space:pre;color:#808000;'>commit d86e7e1adc21d0aa50370306f404253350dd93fb
</span>Author: Ken Cunningham <kencu@macports.org>
AuthorDate: Thu Sep 12 00:00:22 2019 -0700
<span style='display:block; white-space:pre;color:#404040;'> ImageMagick: explicity disable openmp
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> ImageMagick's openmp detection is not working correctly with clang,
</span><span style='display:block; white-space:pre;color:#404040;'> particularly with llvm clang versions newer than 4.0.
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> see: https://trac.macports.org/ticket/57009
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> Although Apple's clang just indicates openmp is not supported,
</span><span style='display:block; white-space:pre;color:#404040;'> llvm's newer clang versions pass the openmp test, but in the end
</span><span style='display:block; white-space:pre;color:#404040;'> are misconfigured by inserting -gomp into the pkg-config link flags.
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> Even when this is corrected to -lomp, the implementation is flawed, and the
</span><span style='display:block; white-space:pre;color:#404040;'> libomp libraries cannot be found by the default ImageMagick pkg-config libs.
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> Finally, if ImageMagick were built with an openmp-supporting clang, such as
</span><span style='display:block; white-space:pre;color:#404040;'> macports-clang-8.0, and if the link issues were properly sorted out, the
</span><span style='display:block; white-space:pre;color:#404040;'> implementation and support is compiler dependent and the pkg-config files
</span><span style='display:block; white-space:pre;color:#404040;'> may not match the capabilities of the compiler that attempts to compile against
</span><span style='display:block; white-space:pre;color:#404040;'> openmp in ImageMagick if it is not the same or a similar compiler.
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> Until this is properly sorted out, explicitly disable openmp on ImageMagick,
</span><span style='display:block; white-space:pre;color:#404040;'> which prevents incorrect pkg-config link libraries from being specified
</span><span style='display:block; white-space:pre;color:#404040;'> when the compiler is a mp-clang compiler.
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> Once a workable plan is in place, a variant to enable openmp can be considered.
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> see: https://trac.macports.org/ticket/24944
</span>---
aqua/LyX/Portfile | 2 +-
editors/emacs/Portfile | 2 +-
graphics/ImageMagick/Portfile | 3 ++-
graphics/vips/Portfile | 2 +-
python/py-wand/Portfile | 2 +-
5 files changed, 6 insertions(+), 5 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/aqua/LyX/Portfile b/aqua/LyX/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index b5971a0..8c68675 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/aqua/LyX/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/aqua/LyX/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -7,7 +7,7 @@ PortGroup cxx11 1.1
</span> name LyX
conflicts LyX1
version 2.3.3
<span style='display:block; white-space:pre;background:#ffe0e0;'>-revision 0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+revision 1
</span> set branch [join [lrange [split ${version} .] 0 1] .]
categories aqua
license GPL-2+
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/editors/emacs/Portfile b/editors/emacs/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index f2571a1..b931c4a 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/editors/emacs/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/editors/emacs/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -73,7 +73,7 @@ platform darwin {
</span>
if {$subport eq $name || $subport eq "emacs-app"} {
version 26.3
<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 263c0152f538d3371c60accb710f3825b01ae097 \
sha256 09c747e048137c99ed35747b012910b704e0974dde4db6696fde7054ce387591 \
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/graphics/ImageMagick/Portfile b/graphics/ImageMagick/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 119b6b9..da5dcd1 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/graphics/ImageMagick/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/graphics/ImageMagick/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -107,7 +107,8 @@ configure.args --enable-shared \
</span> --without-lqr \
--without-pango \
--without-x \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- --with-gs-font-dir=${prefix}/share/fonts/urw-fonts
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ --with-gs-font-dir=${prefix}/share/fonts/urw-fonts \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ --disable-openmp
</span>
if {${os.platform} eq "darwin" && ${os.major} < 11} {
configure.args-append --disable-opencl
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/graphics/vips/Portfile b/graphics/vips/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 18050cf..96b8dbb 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/graphics/vips/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/graphics/vips/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -5,7 +5,7 @@ PortGroup github 1.0
</span> PortGroup gobject_introspection 1.0
github.setup libvips libvips 8.8.3 v
<span style='display:block; white-space:pre;background:#ffe0e0;'>-revision 0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+revision 1
</span> name vips
distname vips-${version}
description VIPS is an image processing library.
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/python/py-wand/Portfile b/python/py-wand/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 5257efa..03c4d1d 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/python/py-wand/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/python/py-wand/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -5,7 +5,7 @@ PortGroup python 1.0
</span>
name py-wand
version 0.5.7
<span style='display:block; white-space:pre;background:#ffe0e0;'>-revision 0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+revision 1
</span> categories-append graphics
platforms darwin
license MIT
</pre><pre style='margin:0'>
</pre>