reenable openmp support, but only with sys-devel/gcc-4.3

Package-Manager: portage-2.2_rc8/cvs/Linux 2.6.27-rc2 i686

4 files changed, 36 insertions, 11 deletions

diff --git a/media-gfx/imagemagick/ChangeLog b/media-gfx/imagemagick/ChangeLog
index 81c7d07b424a..e06ed520cec9 100644
--- a/media-gfx/imagemagick/ChangeLog
+++ b/media-gfx/imagemagick/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for media-gfx/imagemagick
 # Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/imagemagick/ChangeLog,v 1.295 2008/08/16 12:47:10 maekke Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/imagemagick/ChangeLog,v 1.296 2008/08/16 16:50:48 maekke Exp $
+
+  16 Aug 2008; Markus Meier <maekke@gentoo.org> metadata.xml,
+  imagemagick-6.4.2.9.ebuild:
+  reenable openmp support, but only with sys-devel/gcc-4.3
 
 *imagemagick-6.4.2.9 (16 Aug 2008)
 
diff --git a/media-gfx/imagemagick/Manifest b/media-gfx/imagemagick/Manifest
index 6028511972a4..42276d9f0af0 100644
--- a/media-gfx/imagemagick/Manifest
+++ b/media-gfx/imagemagick/Manifest
@@ -23,13 +23,13 @@ EBUILD imagemagick-6.3.5.10.ebuild 3049 RMD160 96173689b9fbe5113923e455bb5f49d82
 EBUILD imagemagick-6.3.8.3-r1.ebuild 3941 RMD160 39c44253826f6e1ba33be5d9770360fb88199e1e SHA1 1cca98a78ad875454005d6e6c5c391bed6e7cd00 SHA256 4f63862b953a7735edcf7275bcb7f6edb8d79ec6f482d00f26dbc70c2034627a
 EBUILD imagemagick-6.4.0.6.ebuild 3919 RMD160 6a493d4c07357433a518c78fbd853130a9d34b9d SHA1 d96f777bf2ab411ce001400163dde0fa06aa48ae SHA256 7e8c86b602c5db0cf3b5e041ef87299562c3e7d3460b67291e262338d7dee521
 EBUILD imagemagick-6.4.2.0.ebuild 4012 RMD160 d3ece0e1fc711f2db697a92404f43a9569271a10 SHA1 eeac6d941851735528d8e4d264e6b188357ccf92 SHA256 ebb34fb5553ebe0c0b430c159f1506d7e26f02fae0a645e249453fce58bf478d
-EBUILD imagemagick-6.4.2.9.ebuild 3956 RMD160 680423544d418c74a8bedf858c995ff0359e97c4 SHA1 5fb594043954d68d2796f58b4993b6612017b0e7 SHA256 1f367110d9094edeccecf9337b0b5a988a8c31b1d92f70a2ea07d793bdc12d44
-MISC ChangeLog 44248 RMD160 63112deb15bcd999a7da7bcd80641af0f35d1644 SHA1 e9a4f1cc4287fcf939cb82f414af403fe90baadf SHA256 e966975f13432ae0961d3f3df212c138cdb0d8e1f60e833d45b201ada80fdf67
-MISC metadata.xml 500 RMD160 caa32630c25439c9de0f48d49c50d011da5636f6 SHA1 da9d9e2cec3403be98de8d64118a4ba7411e30b8 SHA256 f74703fed4e01bb4efe171612d0472ff5f3a35866c358abc3c4b7dc26c5453b7
+EBUILD imagemagick-6.4.2.9.ebuild 4487 RMD160 d65c43f98a963d555dfbac5b7079435f4138c421 SHA1 91fead276835ef83285ecf02b9a1adb550d0f22c SHA256 d01da1acad5615e29ca82531586e9ea8a47abf882073468d6c4d57ccbcb5f1d9
+MISC ChangeLog 44400 RMD160 ec891a155493e72e0a4cc020702420e40969c9e5 SHA1 cd64d8be58bed2ea6c7a0eb9e100f65948b0e14c SHA256 4e6abfe2a09f58be077430d6f89ef7258b99dee94a456a9a8cb63eed4b79157c
+MISC metadata.xml 660 RMD160 2627f5184f9f6c97783a9fa561cb82a6c5d52c3c SHA1 7e1487825756530fc7294e9e93cd297de66e1add SHA256 cd412dbd3f7b776a4d587099c805836a60ab430be941282064551e2810a7dc48
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.9 (GNU/Linux)
 
-iEYEARECAAYFAkimzKEACgkQkKaRLQcq0GKorwCeO1xjBxByQzrzbnprjFbXoY0g
-zLQAn1jlavi8SFQXgaebwNulsjp35cJb
-=PFRt
+iEYEARECAAYFAkinBbsACgkQkKaRLQcq0GLU9gCfa3KoMUUkS7Swbd97vnnzNgc1
+3a8AniCh4Sx7TpCVlIH4NSBA2/OK7O8U
+=xwUs
 -----END PGP SIGNATURE-----
diff --git a/media-gfx/imagemagick/imagemagick-6.4.2.9.ebuild b/media-gfx/imagemagick/imagemagick-6.4.2.9.ebuild
index ad7708d25dbd..a5581ee18fe7 100644
--- a/media-gfx/imagemagick/imagemagick-6.4.2.9.ebuild
+++ b/media-gfx/imagemagick/imagemagick-6.4.2.9.ebuild
@@ -1,8 +1,8 @@
 # Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/imagemagick/imagemagick-6.4.2.9.ebuild,v 1.1 2008/08/16 12:47:10 maekke Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/imagemagick/imagemagick-6.4.2.9.ebuild,v 1.2 2008/08/16 16:50:48 maekke Exp $
 
-inherit eutils multilib perl-app
+inherit eutils multilib perl-app toolchain-funcs
 
 MY_PN=ImageMagick
 MY_P=${MY_PN}-${PV%.*}
@@ -16,7 +16,7 @@ LICENSE="imagemagick"
 SLOT="0"
 KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
 IUSE="bzip2 djvu doc fontconfig fpx graphviz gs hdri jpeg jpeg2k lcms nocxx
-	openexr perl png q8 q32 svg tiff truetype X wmf xml zlib"
+	openexr openmp perl png q8 q32 svg tiff truetype X wmf xml zlib"
 
 RDEPEND="bzip2? ( app-arch/bzip2 )
 	djvu? ( app-text/djvu )
@@ -63,6 +63,11 @@ pkg_setup() {
 		elog "the svg USE-flag requires the X USE-flag set."
 		elog "disabling svg support for now."
 	fi
+
+	if use openmp && ! built_with_use sys-devel/gcc openmp; then
+		eerror "sys-devel/gcc needs to be built with openmp support."
+		die "emerge sys-devel/gcc with USE=\"openmp\""
+	fi
 }
 
 src_unpack() {
@@ -91,6 +96,19 @@ src_compile() {
 		myconf="${myconf} --without-rsvg"
 	fi
 
+	#openmp support only works with >=sys-devel/gcc-4.3
+	# see bug #223825
+	if use openmp ; then
+		if [[ $(gcc-version) != "4.3" ]] ; then
+			ewarn "you need sys-devel/gcc-4.3 to be able to use openmp, disabling."
+			myconf="${myconf} --disable-openmp"
+		else
+			myconf="${myconf} --enable-openmp"
+		fi
+	else
+		myconf="${myconf} --disable-openmp"
+	fi
+
 	econf \
 		${myconf} \
 		--without-included-ltdl \
@@ -98,7 +116,6 @@ src_compile() {
 		--with-ltdl-lib=/usr/$(get_libdir) \
 		--with-threads \
 		--with-modules \
-		--disable-openmp \
 		$(use_with perl) \
 		--with-gs-font-dir=/usr/share/fonts/default/ghostscript \
 		$(use_enable hdri) \
diff --git a/media-gfx/imagemagick/metadata.xml b/media-gfx/imagemagick/metadata.xml
index 3522b8f77200..7ca5a49ecf9e 100644
--- a/media-gfx/imagemagick/metadata.xml
+++ b/media-gfx/imagemagick/metadata.xml
@@ -12,6 +12,10 @@
 		<flag name='hdri'>
 			enable High Dynamic Range Images formats
 		</flag>
+		<flag name='openmp'>
+			build support for the OpenMP (support parallel computing), requires
+			<pkg>sys-devel/gcc-4.3</pkg> built with USE="openmp"
+		</flag>
 		<flag name='q32'>
 			set quantum depth to 32
 		</flag>