SF.net SVN: gar:[26635] csw/mgar/pkg/ImageMagick/trunk/Makefile

[dmichelsen at users.sourceforge.net]

Revision: 26635
          http://sourceforge.net/p/gar/code/26635
Author:   dmichelsen
Date:     2020-05-05 12:46:01 +0000 (Tue, 05 May 2020)
Log Message:
-----------
ImageMagick/trunk: Disable OpenMP as it leads to crashes

Modified Paths:
--------------
    csw/mgar/pkg/ImageMagick/trunk/Makefile

Modified: csw/mgar/pkg/ImageMagick/trunk/Makefile
===================================================================
--- csw/mgar/pkg/ImageMagick/trunk/Makefile	2020-05-03 11:24:10 UTC (rev 26634)
+++ csw/mgar/pkg/ImageMagick/trunk/Makefile	2020-05-05 12:46:01 UTC (rev 26635)
@@ -87,10 +87,8 @@
 RUNTIME_DEP_PKGS_CSWlibmagickcore7q16hdri6 += CSWliblcms2-2
 RUNTIME_DEP_PKGS_CSWlibmagickcore7q16hdri6 += CSWliblqr1-0
 RUNTIME_DEP_PKGS_CSWlibmagickcore7q16hdri6 += CSWlibfftw3-3
-RUNTIME_DEP_PKGS_CSWlibmagickcore7q16hdri6 += CSWlibgomp1
 RUNTIME_DEP_PKGS_CSWlibmagickcore7q16hdri6 += CSWlibgcc-s1
 RUNTIME_DEP_PKGS_CSWlibmagickwand7q16hdri6 += CSWlibmagickcore7q16hdri6
-RUNTIME_DEP_PKGS_CSWlibmagickwand7q16hdri6 += CSWlibgomp1
 RUNTIME_DEP_PKGS_CSWlibmagickwand7q16hdri6 += CSWlibgcc-s1
 RUNTIME_DEP_PKGS_CSWlibmagickcore7q16hdri6 += CSWlibxml2-2
 
@@ -145,7 +143,6 @@
 RUNTIME_DEP_PKGS_CSWimagemagick += CSWlibgs9
 RUNTIME_DEP_PKGS_CSWimagemagick += CSWlibcgraph6
 RUNTIME_DEP_PKGS_CSWimagemagick += CSWlibgvc6
-RUNTIME_DEP_PKGS_CSWimagemagick += CSWlibgomp1
 
 ###
 # Needed for the Solaris ld bug
@@ -169,11 +166,6 @@
 #RUNTIME_DEP_PKGS_CSWpm-image-magick += CSWperl
 #RUNTIME_DEP_PKGS_CSWpm-image-magick += CSWlibmagickcore6q16hdri1
 
-# No idea where that comes from? grep does not find it in those files
-CHECKPKG_OVERRIDES_CSWlibmagickcore7q16hdri6 += file-with-bad-content|/usr/local|root/opt/csw/lib/libMagickCore-7.Q16HDRI.so.6.0.0
-CHECKPKG_OVERRIDES_CSWlibmagickcore7q16hdri6 += file-with-bad-content|/usr/local|root/opt/csw/lib/amd64/libMagickCore-7.Q16HDRI.so.6.0.0
-CHECKPKG_OVERRIDES_CSWlibmagickcore7q16hdri6 += file-with-bad-content|/usr/local|root/opt/csw/lib/sparcv9/libMagickCore-7.Q16HDRI.so.6.0.0
-
 REINPLACE_USRLOCAL += config/mime.xml
 
 EXTRA_LINKER_FLAGS = -lsocket -lnsl 
@@ -207,6 +199,13 @@
 CONFIGURE_ARGS += --with-gslib
 CONFIGURE_ARGS += --with-openjp2
 
+# Deactivate OpenMP as it leads to crashes as reported in
+#   http://lists.opencsw.org/pipermail/users/2020-May/010459.html
+CONFIGURE_ARGS += --disable-dependency-tracking
+CONFIGURE_ARGS += --disable-silent-rules
+CONFIGURE_ARGS += --disable-opencl
+CONFIGURE_ARGS += --disable-openmp
+
 # Disable perl completely until it's rebuilt with GCC
 CONFIGURE_ARGS += --without-perl
 #CONFIGURE_ARGS-32 += --with-perl=$(bindir)/perl

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.