| 1 |
maekke 09/06/02 22:24:31 |
| 2 |
|
| 3 |
Modified: ChangeLog imagemagick-6.5.2.9.ebuild |
| 4 |
Log: |
| 5 |
remove >=sys-devel/gcc-4.3.0[openmp] dep for USE=openmp, as it was before... |
| 6 |
(Portage version: 2.2_rc33/cvs/Linux i686) |
| 7 |
|
| 8 |
Revision Changes Path |
| 9 |
1.355 media-gfx/imagemagick/ChangeLog |
| 10 |
|
| 11 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/media-gfx/imagemagick/ChangeLog?rev=1.355&view=markup |
| 12 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/media-gfx/imagemagick/ChangeLog?rev=1.355&content-type=text/plain |
| 13 |
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/media-gfx/imagemagick/ChangeLog?r1=1.354&r2=1.355 |
| 14 |
|
| 15 |
Index: ChangeLog |
| 16 |
=================================================================== |
| 17 |
RCS file: /var/cvsroot/gentoo-x86/media-gfx/imagemagick/ChangeLog,v |
| 18 |
retrieving revision 1.354 |
| 19 |
retrieving revision 1.355 |
| 20 |
diff -u -r1.354 -r1.355 |
| 21 |
--- ChangeLog 2 Jun 2009 18:16:52 -0000 1.354 |
| 22 |
+++ ChangeLog 2 Jun 2009 22:24:31 -0000 1.355 |
| 23 |
@@ -1,6 +1,10 @@ |
| 24 |
# ChangeLog for media-gfx/imagemagick |
| 25 |
# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2 |
| 26 |
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/imagemagick/ChangeLog,v 1.354 2009/06/02 18:16:52 klausman Exp $ |
| 27 |
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/imagemagick/ChangeLog,v 1.355 2009/06/02 22:24:31 maekke Exp $ |
| 28 |
+ |
| 29 |
+ 02 Jun 2009; Markus Meier <maekke@g.o> imagemagick-6.5.2.9.ebuild: |
| 30 |
+ remove >=sys-devel/gcc-4.3.0[openmp] dep for USE=openmp, as it was |
| 31 |
+ before... |
| 32 |
|
| 33 |
02 Jun 2009; Tobias Klausmann <klausman@g.o> |
| 34 |
imagemagick-6.5.2.9.ebuild: |
| 35 |
|
| 36 |
|
| 37 |
|
| 38 |
1.8 media-gfx/imagemagick/imagemagick-6.5.2.9.ebuild |
| 39 |
|
| 40 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/media-gfx/imagemagick/imagemagick-6.5.2.9.ebuild?rev=1.8&view=markup |
| 41 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/media-gfx/imagemagick/imagemagick-6.5.2.9.ebuild?rev=1.8&content-type=text/plain |
| 42 |
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/media-gfx/imagemagick/imagemagick-6.5.2.9.ebuild?r1=1.7&r2=1.8 |
| 43 |
|
| 44 |
Index: imagemagick-6.5.2.9.ebuild |
| 45 |
=================================================================== |
| 46 |
RCS file: /var/cvsroot/gentoo-x86/media-gfx/imagemagick/imagemagick-6.5.2.9.ebuild,v |
| 47 |
retrieving revision 1.7 |
| 48 |
retrieving revision 1.8 |
| 49 |
diff -u -r1.7 -r1.8 |
| 50 |
--- imagemagick-6.5.2.9.ebuild 2 Jun 2009 18:16:52 -0000 1.7 |
| 51 |
+++ imagemagick-6.5.2.9.ebuild 2 Jun 2009 22:24:31 -0000 1.8 |
| 52 |
@@ -1,6 +1,6 @@ |
| 53 |
# Copyright 1999-2009 Gentoo Foundation |
| 54 |
# Distributed under the terms of the GNU General Public License v2 |
| 55 |
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/imagemagick/imagemagick-6.5.2.9.ebuild,v 1.7 2009/06/02 18:16:52 klausman Exp $ |
| 56 |
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/imagemagick/imagemagick-6.5.2.9.ebuild,v 1.8 2009/06/02 22:24:31 maekke Exp $ |
| 57 |
|
| 58 |
EAPI="2" |
| 59 |
|
| 60 |
@@ -56,7 +56,6 @@ |
| 61 |
|
| 62 |
DEPEND="${RDEPEND} |
| 63 |
>=sys-apps/sed-4 |
| 64 |
- openmp? ( >=sys-devel/gcc-4.3.0[openmp] ) |
| 65 |
X? ( x11-proto/xextproto )" |
| 66 |
|
| 67 |
S="${WORKDIR}/${MY_P2}" |
| 68 |
@@ -98,6 +97,20 @@ |
| 69 |
myconf="${myconf} --without-rsvg" |
| 70 |
fi |
| 71 |
|
| 72 |
+ #openmp support only works with >=sys-devel/gcc-4.3 |
| 73 |
+ # see bug #223825 |
| 74 |
+ if use openmp && built_with_use --missing false sys-devel/gcc openmp; then |
| 75 |
+ if [[ "$(gcc-version)" == "4.2" ]] ; then |
| 76 |
+ ewarn "you need >=sys-devel/gcc-4.3 to be able to use openmp, disabling." |
| 77 |
+ myconf="${myconf} --disable-openmp" |
| 78 |
+ else |
| 79 |
+ myconf="${myconf} --enable-openmp" |
| 80 |
+ fi |
| 81 |
+ else |
| 82 |
+ elog "disabling openmp support (gcc is not built with openmp support)" |
| 83 |
+ myconf="${myconf} --disable-openmp" |
| 84 |
+ fi |
| 85 |
+ |
| 86 |
use truetype && myconf="${myconf} $(use_with corefonts windows-font-dir /usr/share/fonts/corefonts)" |
| 87 |
|
| 88 |
econf \ |
| 89 |
@@ -123,7 +136,6 @@ |
| 90 |
$(use_with jpeg2k jp2) \ |
| 91 |
$(use_with lcms) \ |
| 92 |
$(use_with openexr) \ |
| 93 |
- $(use_enable openmp) \ |
| 94 |
$(use_with png) \ |
| 95 |
$(use_with svg rsvg) \ |
| 96 |
$(use_with tiff) \ |
Archives