CVS commit: pkgsrc/graphics/ImageMagick6

["Jonathan Perkin" <jperkin%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   jperkin
Date:           Mon Dec 11 11:30:41 UTC 2017

Modified Files:
        pkgsrc/graphics/ImageMagick6: Makefile

Log Message:
ImageMagick6: Limit OpenMP workaround to NetBSD.

It's not proven that this issue exists elsewhere and it carries a significant
performance penalty, so re-enable on other platforms.  Bump PKGREVISION.


To generate a diff of this commit:
cvs rdiff -u -r1.10 -r1.11 pkgsrc/graphics/ImageMagick6/Makefile

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/graphics/ImageMagick6/Makefile
diff -u pkgsrc/graphics/ImageMagick6/Makefile:1.10 pkgsrc/graphics/ImageMagick6/Makefile:1.11
--- pkgsrc/graphics/ImageMagick6/Makefile:1.10  Thu Nov 23 17:19:42 2017
+++ pkgsrc/graphics/ImageMagick6/Makefile       Mon Dec 11 11:30:41 2017
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.10 2017/11/23 17:19:42 wiz Exp $
+# $NetBSD: Makefile,v 1.11 2017/12/11 11:30:41 jperkin Exp $
 
-PKGREVISION= 1
+PKGREVISION= 2
 .include "Makefile.common"
 
 PKGNAME=       ImageMagick6-${DISTVERSION}
@@ -17,13 +17,14 @@ CONFIGURE_ARGS+=    --with-fontconfig
 CONFIGURE_ARGS+=       --with-ltdl-include=${BUILDLINK_PREFIX.libltdl}/include
 CONFIGURE_ARGS+=       --with-ltdl-lib=${BUILDLINK_PREFIX.libltdl}/lib
 CONFIGURE_ARGS+=       --with-xml=yes
-CONFIGURE_ARGS+=       --disable-openmp
 CONFIGURE_ARGS+=       --without-perl
 CONFIGURE_ARGS+=       --sysconfdir=${PKG_SYSCONFBASEDIR}
 CONFIGURE_ARGS+=       --program-suffix=6
 # This one used to be optional, but it depends on ghostscript even if it's
 # disabled so having a way to disable it seems pointless.
 CONFIGURE_ARGS+=       --with-gslib
+# http://www.imagemagick.org/discourse-server/viewtopic.php?f=2&t=25475
+CONFIGURE_ARGS.NetBSD+=        --disable-openmp
 PKGCONFIG_OVERRIDE=    Magick++/lib/ImageMagick++.pc.in
 PKGCONFIG_OVERRIDE+=   Magick++/lib/Magick++.pc.in
 PKGCONFIG_OVERRIDE+=   magick/ImageMagick.pc.in