From 272911e6e8baa6384bf447e0754e22b5d3bb0853 Mon Sep 17 00:00:00 2001 From: Samuli Suominen Date: Sun, 23 May 2010 11:53:36 +0000 Subject: [PATCH] Use tc-has-openmp function from toolchain-funcs.eclass to check libgomp availability. Package-Manager: portage-2.2_rc67/cvs/Linux x86_64 --- media-gfx/imagemagick/ChangeLog | 7 ++++++- media-gfx/imagemagick/Manifest | 4 ++-- media-gfx/imagemagick/imagemagick-6.6.1.7.ebuild | 9 ++------- 3 files changed, 10 insertions(+), 10 deletions(-) diff --git a/media-gfx/imagemagick/ChangeLog b/media-gfx/imagemagick/ChangeLog index d576a9dd75e0..cd87f7a6e40c 100644 --- a/media-gfx/imagemagick/ChangeLog +++ b/media-gfx/imagemagick/ChangeLog @@ -1,6 +1,11 @@ # ChangeLog for media-gfx/imagemagick # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/media-gfx/imagemagick/ChangeLog,v 1.398 2010/05/18 15:11:49 jer Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-gfx/imagemagick/ChangeLog,v 1.399 2010/05/23 11:53:36 ssuominen Exp $ + + 23 May 2010; Samuli Suominen + imagemagick-6.6.1.7.ebuild: + Use tc-has-openmp function from toolchain-funcs.eclass to check libgomp + availability. 18 May 2010; Jeroen Roovers imagemagick-6.6.1.2.ebuild: Stable for HPPA (bug #319195). diff --git a/media-gfx/imagemagick/Manifest b/media-gfx/imagemagick/Manifest index 87d792239b1b..6b10f6d75546 100644 --- a/media-gfx/imagemagick/Manifest +++ b/media-gfx/imagemagick/Manifest @@ -3,6 +3,6 @@ DIST ImageMagick-6.6.1-2.tar.xz 6231544 RMD160 8c87f76764356640a86dcaf4c5eb9d2ca DIST ImageMagick-6.6.1-7.tar.xz 6253476 RMD160 4e033f901a939e34e010f3cfa34d7f605813c69b SHA1 294a18dc2d57209dd2e4aff8ad505734df0885e8 SHA256 fd48aa25a1afa1de307ce4376f4aa8b42be9301792d7702bde8651a9a0c893c8 EBUILD imagemagick-6.5.8.8.ebuild 5033 RMD160 cd0a072e0dcd2919afaf55914bc1f8cbd8425db0 SHA1 079ca007a664f8fa808a40bc984af18053455d52 SHA256 aefcfb8c162ea10f0d4e79e4a558d1a4a0036375f6ccf7d71ad8885d451166aa EBUILD imagemagick-6.6.1.2.ebuild 3832 RMD160 101ce0b5352a06e4fada663ae23da9a7d90a50bf SHA1 db14effecfb8a023bd4850144ca661beaeb82385 SHA256 fb27cc1df116380f63c76e35c6d6cc2227af55420bbc98f05537bf1205da3445 -EBUILD imagemagick-6.6.1.7.ebuild 4071 RMD160 98facc4e2e5cf1ca31e60e5988deb2b44e08767a SHA1 a5a54b270c9887252874e485bd5119ee84da2b56 SHA256 785e1af786fe85e4db14f696856dfdfd7e5bdd76d0f858df31ac433e86521005 -MISC ChangeLog 59426 RMD160 46220b7c36324791b91dc7b3ea280b56ad712e82 SHA1 a4b57b8eba66bd18449e361a90cc3979a9fd6a07 SHA256 694ef43acf6d57176b04181e4a9a172e25415ae79a4301b16d4214249539611b +EBUILD imagemagick-6.6.1.7.ebuild 3791 RMD160 e656b0ea43b8c80602b591c0ffbf1846b47f9df2 SHA1 56bbf594b2fc1a37ca50903f8bc46a3e8729cf55 SHA256 e704ad5fc1972b736ea413878c9db3357bc2589f31651347f0967a9a45a53dc5 +MISC ChangeLog 59607 RMD160 be40c780e9da64b4e69ac13a78476454287e311b SHA1 18804a2b4ef05a00a479a5928542c0100f325234 SHA256 af26bdebf0593f8c0360c887d31fc77691dbb574983de8160bd32574fec783f6 MISC metadata.xml 813 RMD160 1a299d749c40a81c6255e74b055d51bb2574947d SHA1 28be5abfb85ef530e3ec5a84678e914175435ed4 SHA256 53592450b5a53784153fc95d665dee08392968adab41bd3032ad759778bde31b diff --git a/media-gfx/imagemagick/imagemagick-6.6.1.7.ebuild b/media-gfx/imagemagick/imagemagick-6.6.1.7.ebuild index a14a7be65473..a3733c07513f 100644 --- a/media-gfx/imagemagick/imagemagick-6.6.1.7.ebuild +++ b/media-gfx/imagemagick/imagemagick-6.6.1.7.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2010 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/media-gfx/imagemagick/imagemagick-6.6.1.7.ebuild,v 1.2 2010/05/17 15:34:45 darkside Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-gfx/imagemagick/imagemagick-6.6.1.7.ebuild,v 1.3 2010/05/23 11:53:36 ssuominen Exp $ EAPI=3 inherit multilib toolchain-funcs versionator @@ -73,12 +73,7 @@ src_configure() { local openmp=disable - # openmp support only works with >=sys-devel/gcc-4.3, bug #223825 - if use openmp && version_is_at_least 4.3 $(gcc-version) ; then - if has_version =sys-devel/gcc-$(gcc-version)*[openmp] ; then - openmp=enable - fi - elif use openmp && has_version sys-devel/gcc-apple && version_is_at_least 4.2.1 $(gcc_version) ; then + if use openmp && tc-has-openmp; then openmp=enable fi -- 2.26.2