From: "Anna Vyalkova" <cyber+gentoo@sysrq.in>
To: gentoo-commits@lists.gentoo.org
Subject: [gentoo-commits] repo/proj/guru:dev commit in: dev-R/RcppArmadillo/
Date: Wed, 9 Feb 2022 13:12:43 +0000 (UTC) [thread overview]
Message-ID: <1644412326.b4c64697ef4aaa8329190f3e5af463f5306e688f.cybertailor@gentoo> (raw)
commit: b4c64697ef4aaa8329190f3e5af463f5306e688f
Author: Anna (cybertailor) Vyalkova <cyber+gentoo <AT> sysrq <DOT> in>
AuthorDate: Wed Feb 9 06:17:48 2022 +0000
Commit: Anna Vyalkova <cyber+gentoo <AT> sysrq <DOT> in>
CommitDate: Wed Feb 9 13:12:06 2022 +0000
URL: https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=b4c64697
dev-R/RcppArmadillo: fix symlinks
Signed-off-by: Anna (cybertailor) Vyalkova <cyber+gentoo <AT> sysrq.in>
dev-R/RcppArmadillo/RcppArmadillo-0.10.2.2.0.ebuild | 18 ++++++++++--------
1 file changed, 10 insertions(+), 8 deletions(-)
diff --git a/dev-R/RcppArmadillo/RcppArmadillo-0.10.2.2.0.ebuild b/dev-R/RcppArmadillo/RcppArmadillo-0.10.2.2.0.ebuild
index 2bd5ac434..9c33fe313 100644
--- a/dev-R/RcppArmadillo/RcppArmadillo-0.10.2.2.0.ebuild
+++ b/dev-R/RcppArmadillo/RcppArmadillo-0.10.2.2.0.ebuild
@@ -3,10 +3,9 @@
EAPI=7
-inherit R-packages
-
-MYPV="$(ver_cut 2-3 ${PV})"
+inherit R-packages eapi8-dosym
+MY_PV="$(ver_cut 2-3 ${PV})"
DESCRIPTION='Rcpp Integration for the Armadillo templated linear algebra library'
SRC_URI="mirror://cran/src/contrib/Archive/${PN}/${PN}_${PV}.tar.gz"
KEYWORDS="~amd64"
@@ -15,7 +14,7 @@ LICENSE='GPL-2+'
DEPEND="
>=dev-lang/R-3.3.0
>=dev-R/Rcpp-0.11.0
- =sci-libs/armadillo-${MYPV}*:=[lapack]
+ =sci-libs/armadillo-${MY_PV}*:=[lapack]
"
RDEPEND="${DEPEND}"
@@ -23,16 +22,19 @@ RDEPEND="${DEPEND}"
src_prepare() {
default
+
#remove bundled
rm -r inst/include/armadillo_bits || die
rm inst/include/armadillo || die
+
#link to sci-libs/armadillo
- dosym /usr/include/armadillo_bits inst/include/armadillo_bits
- dosym /usr/include/armadillo inst/include/armadillo
+ ln -s "${ESYSROOT}"/usr/include/armadillo_bits inst/include/armadillo_bits || die
+ ln -s "${ESYSROOT}"/usr/include/armadillo inst/include/armadillo || die
}
src_install() {
R-packages_src_install
- dosym /usr/include/armadillo_bits "/usr/$(get_libdir)/R/site-library/${PN}/include/armadillo_bits"
- dosym /usr/include/armadillo "/usr/$(get_libdir)/R/site-library/${PN}/include/armadillo"
+
+ dosym8 -r /usr/include/armadillo_bits "/usr/$(get_libdir)/R/site-library/${PN}/include/armadillo_bits"
+ dosym8 -r /usr/include/armadillo "/usr/$(get_libdir)/R/site-library/${PN}/include/armadillo"
}
next reply other threads:[~2022-02-09 13:12 UTC|newest]
Thread overview: 14+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-02-09 13:12 Anna Vyalkova [this message]
-- strict thread matches above, loose matches on Subject: below --
2023-07-31 15:52 [gentoo-commits] repo/proj/guru:master commit in: dev-R/RcppArmadillo/ David Roman
2023-07-31 15:48 ` [gentoo-commits] repo/proj/guru:dev " David Roman
2023-07-31 15:48 David Roman
2023-07-31 15:48 David Roman
2023-07-29 15:04 [gentoo-commits] repo/proj/guru:master " Florian Schmaus
2023-07-29 15:04 ` [gentoo-commits] repo/proj/guru:dev " Florian Schmaus
2022-05-28 12:53 Alessandro Barbieri
2022-04-20 21:57 Alessandro Barbieri
2022-03-11 2:02 Alessandro Barbieri
2022-02-24 7:54 Anna Vyalkova
2022-02-23 13:44 Anna Vyalkova
2022-02-17 21:11 Anna Vyalkova
2021-06-01 4:56 Alessandro Barbieri
2021-05-31 23:38 Alessandro Barbieri
2021-05-31 22:04 Alessandro Barbieri
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1644412326.b4c64697ef4aaa8329190f3e5af463f5306e688f.cybertailor@gentoo \
--to=cyber+gentoo@sysrq.in \
--cc=gentoo-commits@lists.gentoo.org \
--cc=gentoo-dev@lists.gentoo.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox