Thu Jan 8 14:29:18 2009 UTC ()
Disable OpenMP support. It is randomly detected under Mac OS X Leopard
with the latest version of Xcode Tools which breaks the build, probably
because "buildlink3" doesn't allow to pick up the library.


(tron)
diff -r1.154 -r1.155 pkgsrc/graphics/ImageMagick/Makefile
cvs diff -r1.154 -r1.155 pkgsrc/graphics/ImageMagick/Makefile (expand / switch to unified diff)

--- pkgsrc/graphics/ImageMagick/Makefile 2009/01/07 08:58:07 1.154
+++ pkgsrc/graphics/ImageMagick/Makefile 2009/01/08 14:29:18 1.155
@@ -1,32 +1,33 @@ @@ -1,32 +1,33 @@
1# $NetBSD: Makefile,v 1.154 2009/01/07 08:58:07 adam Exp $ 1# $NetBSD: Makefile,v 1.155 2009/01/08 14:29:18 tron Exp $
2 2
3.include "Makefile.common" 3.include "Makefile.common"
4 4
5PKGNAME= ImageMagick-${DISTVERSION} 5PKGNAME= ImageMagick-${DISTVERSION}
6 6
7MAINTAINER= adam@NetBSD.org 7MAINTAINER= adam@NetBSD.org
8HOMEPAGE= http://www.imagemagick.org/ 8HOMEPAGE= http://www.imagemagick.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
13PKG_DESTDIR_SUPPORT= user-destdir 13PKG_DESTDIR_SUPPORT= user-destdir
14PKG_INSTALLATION_TYPES= overwrite pkgviews 14PKG_INSTALLATION_TYPES= overwrite pkgviews
15 15
16USE_LANGUAGES= c c++ c99 16USE_LANGUAGES= c c++ c99
17USE_LIBTOOL= yes 17USE_LIBTOOL= yes
18USE_TOOLS+= gmake 18USE_TOOLS+= gmake
19GNU_CONFIGURE= yes 19GNU_CONFIGURE= yes
 20CONFIGURE_ARGS+= --disable-openmp
20PKGCONFIG_OVERRIDE= Magick++/lib/ImageMagick++.pc.in 21PKGCONFIG_OVERRIDE= Magick++/lib/ImageMagick++.pc.in
21PKGCONFIG_OVERRIDE+= magick/ImageMagick.pc.in 22PKGCONFIG_OVERRIDE+= magick/ImageMagick.pc.in
22 23
23GCC_REQD+= 2.95.3 24GCC_REQD+= 2.95.3
24 25
25PLIST_SUBST+= IM_MAJOR_VER=${IM_MAJOR_VER:Q} 26PLIST_SUBST+= IM_MAJOR_VER=${IM_MAJOR_VER:Q}
26PLIST_SUBST+= IM_MAJOR_LIB_VER=${IM_MAJOR_LIB_VER:Q} 27PLIST_SUBST+= IM_MAJOR_LIB_VER=${IM_MAJOR_LIB_VER:Q}
27 28
28TEST_TARGET= check 29TEST_TARGET= check
29 30
30.include "options.mk" 31.include "options.mk"
31 32
32.if !empty(MACHINE_PLATFORM:MNetBSD-*-sparc64) 33.if !empty(MACHINE_PLATFORM:MNetBSD-*-sparc64)