* [gentoo-commits] gentoo-x86 commit in sci-libs/vtk: vtk-6.1.0-r1.ebuild vtk-6.1.0.ebuild ChangeLog
@ 2015-02-23 8:16 Justin Lecher (jlec)
0 siblings, 0 replies; only message in thread
From: Justin Lecher (jlec) @ 2015-02-23 8:16 UTC (permalink / raw
To: gentoo-commits
jlec 15/02/23 08:16:14
Modified: vtk-6.1.0-r1.ebuild vtk-6.1.0.ebuild ChangeLog
Log:
Fix libdir detection in all versions, #513680
(Portage version: 2.2.17/cvs/Linux x86_64, signed Manifest commit with key B9D4F231BD1558AB!)
Revision Changes Path
1.5 sci-libs/vtk/vtk-6.1.0-r1.ebuild
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-libs/vtk/vtk-6.1.0-r1.ebuild?rev=1.5&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-libs/vtk/vtk-6.1.0-r1.ebuild?rev=1.5&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-libs/vtk/vtk-6.1.0-r1.ebuild?r1=1.4&r2=1.5
Index: vtk-6.1.0-r1.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/sci-libs/vtk/vtk-6.1.0-r1.ebuild,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- vtk-6.1.0-r1.ebuild 22 Feb 2015 11:51:52 -0000 1.4
+++ vtk-6.1.0-r1.ebuild 23 Feb 2015 08:16:14 -0000 1.5
@@ -1,6 +1,6 @@
# Copyright 1999-2015 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-libs/vtk/vtk-6.1.0-r1.ebuild,v 1.4 2015/02/22 11:51:52 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-libs/vtk/vtk-6.1.0-r1.ebuild,v 1.5 2015/02/23 08:16:14 jlec Exp $
EAPI=5
@@ -316,8 +316,8 @@
mycmakeargs+=(
# -DR_LIBRARY_BLAS=$($(tc-getPKG_CONFIG) --libs blas)
# -DR_LIBRARY_LAPACK=$($(tc-getPKG_CONFIG) --libs lapack)
- -DR_LIBRARY_BLAS=/usr/lib64/R/lib/libR.so
- -DR_LIBRARY_LAPACK=/usr/lib64/R/lib/libR.so
+ -DR_LIBRARY_BLAS=/usr/$(get_libdir)/R/lib/libR.so
+ -DR_LIBRARY_LAPACK=/usr/$(get_libdir)/R/lib/libR.so
)
fi
1.5 sci-libs/vtk/vtk-6.1.0.ebuild
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-libs/vtk/vtk-6.1.0.ebuild?rev=1.5&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-libs/vtk/vtk-6.1.0.ebuild?rev=1.5&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-libs/vtk/vtk-6.1.0.ebuild?r1=1.4&r2=1.5
Index: vtk-6.1.0.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/sci-libs/vtk/vtk-6.1.0.ebuild,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- vtk-6.1.0.ebuild 22 Feb 2015 11:51:52 -0000 1.4
+++ vtk-6.1.0.ebuild 23 Feb 2015 08:16:14 -0000 1.5
@@ -1,6 +1,6 @@
# Copyright 1999-2015 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-libs/vtk/vtk-6.1.0.ebuild,v 1.4 2015/02/22 11:51:52 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-libs/vtk/vtk-6.1.0.ebuild,v 1.5 2015/02/23 08:16:14 jlec Exp $
EAPI=5
@@ -315,8 +315,8 @@
mycmakeargs+=(
# -DR_LIBRARY_BLAS=$($(tc-getPKG_CONFIG) --libs blas)
# -DR_LIBRARY_LAPACK=$($(tc-getPKG_CONFIG) --libs lapack)
- -DR_LIBRARY_BLAS=/usr/lib64/R/lib/libR.so
- -DR_LIBRARY_LAPACK=/usr/lib64/R/lib/libR.so
+ -DR_LIBRARY_BLAS=/usr/$(get_libdir)/R/lib/libR.so
+ -DR_LIBRARY_LAPACK=/usr/$(get_libdir)/R/lib/libR.so
)
fi
1.127 sci-libs/vtk/ChangeLog
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-libs/vtk/ChangeLog?rev=1.127&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-libs/vtk/ChangeLog?rev=1.127&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-libs/vtk/ChangeLog?r1=1.126&r2=1.127
Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/sci-libs/vtk/ChangeLog,v
retrieving revision 1.126
retrieving revision 1.127
diff -u -r1.126 -r1.127
--- ChangeLog 22 Feb 2015 11:51:52 -0000 1.126
+++ ChangeLog 23 Feb 2015 08:16:14 -0000 1.127
@@ -1,6 +1,10 @@
# ChangeLog for sci-libs/vtk
# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-libs/vtk/ChangeLog,v 1.126 2015/02/22 11:51:52 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-libs/vtk/ChangeLog,v 1.127 2015/02/23 08:16:14 jlec Exp $
+
+ 23 Feb 2015; Justin Lecher <jlec@gentoo.org> vtk-6.1.0-r1.ebuild,
+ vtk-6.1.0.ebuild:
+ Fix libdir detection in all versions, #513680
22 Feb 2015; Justin Lecher <jlec@gentoo.org> vtk-6.0.0.ebuild,
vtk-6.1.0-r1.ebuild, vtk-6.1.0.ebuild:
^ permalink raw reply [flat|nested] only message in thread
only message in thread, other threads:[~2015-02-23 8:16 UTC | newest]
Thread overview: (only message) (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2015-02-23 8:16 [gentoo-commits] gentoo-x86 commit in sci-libs/vtk: vtk-6.1.0-r1.ebuild vtk-6.1.0.ebuild ChangeLog Justin Lecher (jlec)
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox