summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorFabian Groffen <grobian@gentoo.org>2013-08-15 09:57:38 +0000
committerFabian Groffen <grobian@gentoo.org>2013-08-15 09:57:38 +0000
commitbb21a085f7c9885f929e2013f1246198c82d369d (patch)
tree6bbfcc89b03cb159d4a851cd149b1c172e6653e1
parentDon't patch twice (bug #481142, thanks to Patrick Lauer). (diff)
downloadgentoo-2-bb21a085f7c9885f929e2013f1246198c82d369d.tar.gz
gentoo-2-bb21a085f7c9885f929e2013f1246198c82d369d.tar.bz2
gentoo-2-bb21a085f7c9885f929e2013f1246198c82d369d.zip
Fix linking on Solaris
(Portage version: 2.2.01.22288-prefix/cvs/SunOS i386, signed Manifest commit with key 0x5F75F607C5C74E89)
-rw-r--r--media-gfx/imagemagick/ChangeLog5
-rw-r--r--media-gfx/imagemagick/imagemagick-6.8.6.8.ebuild6
2 files changed, 8 insertions, 3 deletions
diff --git a/media-gfx/imagemagick/ChangeLog b/media-gfx/imagemagick/ChangeLog
index 401cba041f03..902b177c813a 100644
--- a/media-gfx/imagemagick/ChangeLog
+++ b/media-gfx/imagemagick/ChangeLog
@@ -1,6 +1,9 @@
# ChangeLog for media-gfx/imagemagick
# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/imagemagick/ChangeLog,v 1.504 2013/08/10 11:37:16 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/imagemagick/ChangeLog,v 1.505 2013/08/15 09:57:38 grobian Exp $
+
+ 15 Aug 2013; Fabian Groffen <grobian@gentoo.org> imagemagick-6.8.6.8.ebuild:
+ Fix linking on Solaris
*imagemagick-6.8.6.8 (10 Aug 2013)
diff --git a/media-gfx/imagemagick/imagemagick-6.8.6.8.ebuild b/media-gfx/imagemagick/imagemagick-6.8.6.8.ebuild
index 4107802cae8b..eff7062d7a0d 100644
--- a/media-gfx/imagemagick/imagemagick-6.8.6.8.ebuild
+++ b/media-gfx/imagemagick/imagemagick-6.8.6.8.ebuild
@@ -1,9 +1,9 @@
# Copyright 1999-2013 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/imagemagick/imagemagick-6.8.6.8.ebuild,v 1.1 2013/08/10 11:37:16 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/imagemagick/imagemagick-6.8.6.8.ebuild,v 1.2 2013/08/15 09:57:38 grobian Exp $
EAPI=5
-inherit multilib toolchain-funcs versionator libtool eutils
+inherit multilib toolchain-funcs versionator libtool flag-o-matic eutils
MY_P=ImageMagick-$(replace_version_separator 3 '-')
@@ -79,6 +79,8 @@ src_configure() {
local openmp=disable
use openmp && { tc-has-openmp && openmp=enable; }
+ [[ ${CHOST} == *-solaris* ]] && append-ldflags -lnsl -lsocket
+
econf \
$(use_enable static-libs static) \
$(use_enable hdri) \