diff options
| author |   Benda XU <heroxbd@gentoo.org> | 2014-02-17 12:34:34 +0000 |
|---|---|---|
| committer | Benda XU <heroxbd@gentoo.org> | 2014-02-17 12:34:34 +0000 |
| commit | 2e66e088e9a9c49e55a5f8577d4863fbb15ad330 (patch) | |
| tree | 5aa8a32d8571a47f2533b59d5c4aa14f7539cdac /dev-lang | |
| parent | Fixed problem with root= boot parameter being ignored by dracut in hostonly (diff) | |
| download | gentoo-2-2e66e088e9a9c49e55a5f8577d4863fbb15ad330.tar.gz gentoo-2-2e66e088e9a9c49e55a5f8577d4863fbb15ad330.tar.bz2 gentoo-2-2e66e088e9a9c49e55a5f8577d4863fbb15ad330.zip | |
Pass correct blas path to configure, pass {tk,tcl}-config scripts to configure explicitly for Prefix. Credits to Michael Schubert, bug 499356.
(Portage version: 2.2.8-r1/cvs/Linux x86_64, unsigned Manifest commit)
Diffstat (limited to 'dev-lang')
| -rw-r--r-- | dev-lang/R/ChangeLog | 6 | ||||
| -rw-r--r-- | dev-lang/R/R-3.0.2.ebuild | 8 |
2 files changed, 10 insertions, 4 deletions
diff --git a/dev-lang/R/ChangeLog b/dev-lang/R/ChangeLog index 406eceda2d56..353c3f348f1f 100644 --- a/dev-lang/R/ChangeLog +++ b/dev-lang/R/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for dev-lang/R # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/dev-lang/R/ChangeLog,v 1.229 2014/01/15 12:17:57 jlec Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-lang/R/ChangeLog,v 1.230 2014/02/17 12:34:34 heroxbd Exp $ + + 17 Feb 2014; Benda Xu <heroxbd@gentoo.org> R-3.0.2.ebuild: + Pass correct blas path to configure, pass {tk,tcl}-config scripts to configure + explicitly for Prefix. Credits to Michael Schubert, bug 499356. 15 Jan 2014; Justin Lecher <jlec@gentoo.org> -R-2.10.1.ebuild, -R-2.15.3.ebuild: diff --git a/dev-lang/R/R-3.0.2.ebuild b/dev-lang/R/R-3.0.2.ebuild index 55d3f319e477..1600e215fba1 100644 --- a/dev-lang/R/R-3.0.2.ebuild +++ b/dev-lang/R/R-3.0.2.ebuild @@ -1,6 +1,6 @@ -# Copyright 1999-2013 Gentoo Foundation +# Copyright 1999-2014 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-lang/R/R-3.0.2.ebuild,v 1.3 2013/11/03 20:38:32 mattst88 Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-lang/R/R-3.0.2.ebuild,v 1.4 2014/02/17 12:34:34 heroxbd Exp $ EAPI=5 @@ -139,7 +139,7 @@ src_configure() { --with-system-bzlib \ --with-system-pcre \ --with-system-xz \ - --with-blas="$($(tc-getPKG_CONFIG) --libs blas)" \ + --with-blas="$($(tc-getPKG_CONFIG) --variable=libdir blas)" \ --docdir="${EPREFIX}/usr/share/doc/${PF}" \ rdocdir="${EPREFIX}/usr/share/doc/${PF}" \ $(use_enable nls) \ @@ -157,6 +157,8 @@ src_configure() { $(use_with readline) \ $(use_with tiff libtiff) \ $(use_with tk tcltk) \ + $(use_with tk tk-config "${EPREFIX}"/usr/lib/tkConfig.sh) \ + $(use_with tk tcl-config "${EPREFIX}"/usr/lib/tclConfig.sh) \ $(use_with X x) } |