summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChris Reffett <creffett@gentoo.org>2013-08-20 02:07:05 +0000
committerChris Reffett <creffett@gentoo.org>2013-08-20 02:07:05 +0000
commiteade6645b888bc1d780e8b9c788f35510aa95af1 (patch)
tree1eb02b48b35832f3e40b43df2d95cb90c5d9746e /media-libs/opengtl
parentVersion bump. (diff)
downloadgentoo-2-eade6645b888bc1d780e8b9c788f35510aa95af1.tar.gz
gentoo-2-eade6645b888bc1d780e8b9c788f35510aa95af1.tar.bz2
gentoo-2-eade6645b888bc1d780e8b9c788f35510aa95af1.zip
Add conditional patch for building with llvm-3.3, bug 474818
(Portage version: 2.2.0/cvs/Linux x86_64, signed Manifest commit with key 42618354)
Diffstat (limited to 'media-libs/opengtl')
-rw-r--r--media-libs/opengtl/ChangeLog5
-rw-r--r--media-libs/opengtl/opengtl-0.9.18.ebuild12
2 files changed, 13 insertions, 4 deletions
diff --git a/media-libs/opengtl/ChangeLog b/media-libs/opengtl/ChangeLog
index 3f7c5ffc2432..a713c87924ff 100644
--- a/media-libs/opengtl/ChangeLog
+++ b/media-libs/opengtl/ChangeLog
@@ -1,6 +1,9 @@
# ChangeLog for media-libs/opengtl
# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/opengtl/ChangeLog,v 1.20 2013/04/20 15:42:29 johu Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/opengtl/ChangeLog,v 1.21 2013/08/20 02:07:05 creffett Exp $
+
+ 20 Aug 2013; Chris Reffett <creffett@gentoo.org> opengtl-0.9.18.ebuild:
+ Add conditional patch for building with llvm-3.3, bug 474818
20 Apr 2013; Johannes Huber <johu@gentoo.org>
-files/opengtl-0.9.17-gcc-4.7.patch, -files/opengtl-0.9.17-ldflags.patch,
diff --git a/media-libs/opengtl/opengtl-0.9.18.ebuild b/media-libs/opengtl/opengtl-0.9.18.ebuild
index 9346588240a2..2cad54908a34 100644
--- a/media-libs/opengtl/opengtl-0.9.18.ebuild
+++ b/media-libs/opengtl/opengtl-0.9.18.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2013 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/opengtl/opengtl-0.9.18.ebuild,v 1.4 2013/04/15 19:02:00 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/opengtl/opengtl-0.9.18.ebuild,v 1.5 2013/08/20 02:07:05 creffett Exp $
EAPI=5
@@ -10,7 +10,7 @@ inherit cmake-utils
DESCRIPTION="Collection of libraries for graphics transformation algorithms"
HOMEPAGE="http://opengtl.org/"
-SRC_URI="http://download.opengtl.org/${MY_P}.tar.bz2"
+SRC_URI="http://download.opengtl.org/${MY_P}.tar.bz2 http://dev.gentoo.org/~creffett/distfiles/${PN}-0.9.18-llvm-3.3.patch"
LICENSE="LGPL-2"
SLOT="0"
@@ -20,7 +20,6 @@ IUSE="debug test"
RDEPEND="
media-libs/libpng:0=
>=sys-devel/llvm-3.1
- <sys-devel/llvm-3.3
"
DEPEND="${RDEPEND}
test? ( dev-util/lcov )
@@ -35,6 +34,13 @@ PATCHES=(
"${FILESDIR}/${PN}-0.9.18-underlinking.patch"
)
+src_prepare() {
+ if has_version ">=sys-devel/llvm-3.3"; then
+ epatch "${DISTDIR}/${PN}-0.9.18-llvm-3.3.patch"
+ fi
+ cmake-utils_src_prepare
+}
+
src_configure() {
local mycmakeargs=(
-DCMAKE_INSTALL_RPATH_USE_LINK_PATH=TRUE