summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSebastian Pipping <sping@gentoo.org>2012-02-11 23:01:23 +0000
committerSebastian Pipping <sping@gentoo.org>2012-02-11 23:01:23 +0000
commitc9a8391e6d8bfe46614e7402ef7976adba80c60f (patch)
treef2cc0a3920321a067117329f517db6e8d73c8fe1 /media-libs
parentVersion bump for dev channel release. Disable gold linker flags. Depend on >=... (diff)
downloadgentoo-2-c9a8391e6d8bfe46614e7402ef7976adba80c60f.tar.gz
gentoo-2-c9a8391e6d8bfe46614e7402ef7976adba80c60f.tar.bz2
gentoo-2-c9a8391e6d8bfe46614e7402ef7976adba80c60f.zip
media-libs/opencollada: Append LDPATH to env.d file
(Portage version: 2.1.10.45/cvs/Linux x86_64)
Diffstat (limited to 'media-libs')
-rw-r--r--media-libs/opencollada/ChangeLog10
-rw-r--r--media-libs/opencollada/opencollada-0_p864-r1.ebuild (renamed from media-libs/opencollada/opencollada-0_p864.ebuild)10
2 files changed, 18 insertions, 2 deletions
diff --git a/media-libs/opencollada/ChangeLog b/media-libs/opencollada/ChangeLog
index cd2e62818fc7..132ecaaa3b38 100644
--- a/media-libs/opencollada/ChangeLog
+++ b/media-libs/opencollada/ChangeLog
@@ -1,6 +1,14 @@
# ChangeLog for media-libs/opencollada
# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/opencollada/ChangeLog,v 1.2 2012/01/27 16:47:42 sping Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/opencollada/ChangeLog,v 1.3 2012/02/11 23:01:22 sping Exp $
+
+*opencollada-0_p864-r1 (11 Feb 2012)
+
+ 11 Feb 2012; Sebastian Pipping <sping@gentoo.org> -opencollada-0_p864.ebuild,
+ +opencollada-0_p864-r1.ebuild:
+ Make sure installed libs can be linked against despite their
+ /usr/lib*/opencollada location (thanks to Anthoine Bourgeois!), workaround
+ parallel make issues
27 Jan 2012; Sebastian Pipping <sping@gentoo.org> opencollada-0_p864.ebuild:
Fix installation on arch x86 (bug #400823)
diff --git a/media-libs/opencollada/opencollada-0_p864.ebuild b/media-libs/opencollada/opencollada-0_p864-r1.ebuild
index d741d87ad16a..f50de8bc3daa 100644
--- a/media-libs/opencollada/opencollada-0_p864.ebuild
+++ b/media-libs/opencollada/opencollada-0_p864-r1.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/opencollada/opencollada-0_p864.ebuild,v 1.2 2012/01/27 16:47:42 sping Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/opencollada/opencollada-0_p864-r1.ebuild,v 1.1 2012/02/11 23:01:22 sping Exp $
EAPI="3"
@@ -51,11 +51,19 @@ src_configure() {
cmake-utils_src_configure
}
+src_compile() {
+ MAKEOPTS="${MAKEOPTS} -j1" default # TODO
+}
+
src_install() {
cmake-utils_src_install
if [[ $(get_libdir) != 'lib' ]]; then
mv "${D}"/usr/{lib,$(get_libdir)} || die
fi
+ dodir /etc/env.d || die
+ echo "LDPATH=/usr/$(get_libdir)/opencollada" \
+ > "${D}"/etc/env.d/99opencollada || die
+
dobin build/bin/OpenCOLLADAValidator || die
}