Mon Dec 11 11:30:41 2017 UTC ()
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.


(jperkin)
diff -r1.10 -r1.11 pkgsrc/graphics/ImageMagick6/Makefile
cvs diff -r1.10 -r1.11 pkgsrc/graphics/ImageMagick6/Makefile (expand / switch to unified diff)

--- pkgsrc/graphics/ImageMagick6/Makefile 2017/11/23 17:19:42 1.10
+++ pkgsrc/graphics/ImageMagick6/Makefile 2017/12/11 11:30:41 1.11
@@ -1,39 +1,40 @@ @@ -1,39 +1,40 @@
1# $NetBSD: Makefile,v 1.10 2017/11/23 17:19:42 wiz Exp $ 1# $NetBSD: Makefile,v 1.11 2017/12/11 11:30:41 jperkin Exp $
2 2
3PKGREVISION= 1 3PKGREVISION= 2
4.include "Makefile.common" 4.include "Makefile.common"
5 5
6PKGNAME= ImageMagick6-${DISTVERSION} 6PKGNAME= ImageMagick6-${DISTVERSION}
7 7
8MAINTAINER= pkgsrc-users@NetBSD.org 8MAINTAINER= pkgsrc-users@NetBSD.org
9COMMENT= Package for display and interactive manipulation of images 9COMMENT= Package for display and interactive manipulation of images
10 10
11CONFLICTS= geomview<1.8.1nb2 # used to have a program named 'animate' 11CONFLICTS= geomview<1.8.1nb2 # used to have a program named 'animate'
12 12
13USE_LANGUAGES= c c++ c99 13USE_LANGUAGES= c c++ c99
14USE_TOOLS+= gmake pkg-config:run 14USE_TOOLS+= gmake pkg-config:run
15CONFIGURE_ARGS+= --disable-assert 15CONFIGURE_ARGS+= --disable-assert
16CONFIGURE_ARGS+= --with-fontconfig 16CONFIGURE_ARGS+= --with-fontconfig
17CONFIGURE_ARGS+= --with-ltdl-include=${BUILDLINK_PREFIX.libltdl}/include 17CONFIGURE_ARGS+= --with-ltdl-include=${BUILDLINK_PREFIX.libltdl}/include
18CONFIGURE_ARGS+= --with-ltdl-lib=${BUILDLINK_PREFIX.libltdl}/lib 18CONFIGURE_ARGS+= --with-ltdl-lib=${BUILDLINK_PREFIX.libltdl}/lib
19CONFIGURE_ARGS+= --with-xml=yes 19CONFIGURE_ARGS+= --with-xml=yes
20CONFIGURE_ARGS+= --disable-openmp 
21CONFIGURE_ARGS+= --without-perl 20CONFIGURE_ARGS+= --without-perl
22CONFIGURE_ARGS+= --sysconfdir=${PKG_SYSCONFBASEDIR} 21CONFIGURE_ARGS+= --sysconfdir=${PKG_SYSCONFBASEDIR}
23CONFIGURE_ARGS+= --program-suffix=6 22CONFIGURE_ARGS+= --program-suffix=6
24# This one used to be optional, but it depends on ghostscript even if it's 23# This one used to be optional, but it depends on ghostscript even if it's
25# disabled so having a way to disable it seems pointless. 24# disabled so having a way to disable it seems pointless.
26CONFIGURE_ARGS+= --with-gslib 25CONFIGURE_ARGS+= --with-gslib
 26# http://www.imagemagick.org/discourse-server/viewtopic.php?f=2&t=25475
 27CONFIGURE_ARGS.NetBSD+= --disable-openmp
27PKGCONFIG_OVERRIDE= Magick++/lib/ImageMagick++.pc.in 28PKGCONFIG_OVERRIDE= Magick++/lib/ImageMagick++.pc.in
28PKGCONFIG_OVERRIDE+= Magick++/lib/Magick++.pc.in 29PKGCONFIG_OVERRIDE+= Magick++/lib/Magick++.pc.in
29PKGCONFIG_OVERRIDE+= magick/ImageMagick.pc.in 30PKGCONFIG_OVERRIDE+= magick/ImageMagick.pc.in
30PKGCONFIG_OVERRIDE+= magick/MagickCore.pc.in 31PKGCONFIG_OVERRIDE+= magick/MagickCore.pc.in
31PKGCONFIG_OVERRIDE+= wand/MagickWand.pc.in 32PKGCONFIG_OVERRIDE+= wand/MagickWand.pc.in
32PKGCONFIG_OVERRIDE+= wand/Wand.pc.in 33PKGCONFIG_OVERRIDE+= wand/Wand.pc.in
33 34
34SUBST_CLASSES+= pkgcfg 35SUBST_CLASSES+= pkgcfg
35SUBST_FILES.pkgcfg= ${PKGCONFIG_OVERRIDE} Magick++/bin/Magick++-config.in 36SUBST_FILES.pkgcfg= ${PKGCONFIG_OVERRIDE} Magick++/bin/Magick++-config.in
36SUBST_FILES.pkgcfg+= magick/Magick-config.in magick/MagickCore-config.in 37SUBST_FILES.pkgcfg+= magick/Magick-config.in magick/MagickCore-config.in
37SUBST_FILES.pkgcfg+= wand/MagickWand-config.in wand/Wand-config.in 38SUBST_FILES.pkgcfg+= wand/MagickWand-config.in wand/Wand-config.in
38SUBST_MESSAGE.pkgcfg= Fixing pkg-config requirements. 39SUBST_MESSAGE.pkgcfg= Fixing pkg-config requirements.
39SUBST_SED.pkgcfg= -e 's|MagickCore-config |MagickCore-config6 |g' 40SUBST_SED.pkgcfg= -e 's|MagickCore-config |MagickCore-config6 |g'