From 25ac46b96f4c4c7d4e13861c93f6fe1f3e02e111 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fran=C3=A7ois=20Bissey?= Date: Fri, 15 Nov 2019 00:02:07 +1300 Subject: [PATCH] sci-biology/fsl: use generic blas/lapack revert stuff. Package-Manager: Portage-2.3.76, Repoman-2.3.16 --- sci-biology/fsl/ChangeLog | 3 +++ sci-biology/fsl/fsl-6.0.2.ebuild | 12 ++++++------ 2 files changed, 9 insertions(+), 6 deletions(-) diff --git a/sci-biology/fsl/ChangeLog b/sci-biology/fsl/ChangeLog index 1d1d42a..80eea53 100644 --- a/sci-biology/fsl/ChangeLog +++ b/sci-biology/fsl/ChangeLog @@ -1,3 +1,6 @@ + 14 Nov 2019; François Bissey fsl-6.0.2.ebuild: + sci-biology/fsl: use generic blas/lapack revert stuff. + 08 Nov 2019; François Bissey fsl-6.0.2.ebuild: sci-biology/fsl: final touches. Skip mist-clean. diff --git a/sci-biology/fsl/fsl-6.0.2.ebuild b/sci-biology/fsl/fsl-6.0.2.ebuild index 6b5ff00..fbc7476 100644 --- a/sci-biology/fsl/fsl-6.0.2.ebuild +++ b/sci-biology/fsl/fsl-6.0.2.ebuild @@ -25,8 +25,8 @@ DEPEND=" sys-libs/zlib dev-lang/tcl:0= dev-lang/tk:0= - virtual/lapack - virtual/blas + >=virtual/lapack-3.8 + >=virtual/blas-3.8 " RDEPEND="${DEPEND}" @@ -78,10 +78,6 @@ src_prepare(){ $(grep -rl "\${FSLDIR}/bin" etc/matlab/*)\ $(grep -rl "\$FSLDIR/bin" etc/matlab/*) || die - # Not caught by the previous sed. Usually append - sed -e "s:\${FSLDIR}/bin::g" \ - -i $(grep -rl "\${FSLDIR}/bin" src/*) || die - sed -e "s:\$FSLDIR/data:${EPREFIX}/usr/share/fsl/data:g" \ -e "s:\${FSLDIR}/data:${EPREFIX}/usr/share/fsl/data:g" \ -i $(grep -rl "\$FSLDIR/data" src/*) \ @@ -100,6 +96,10 @@ src_prepare(){ -i $(grep -rlI "\$FSLDIR/etc" *) \ -i $(grep -rlI "\${FSLDIR}/etc" *) || die + # Use generic blas/lapack rather than openblas + sed -e "s:-lopenblas:-llapack -lblas:g" \ + -i $(grep -rlI lopenblas *) || die + # script wanting to have access to flsversion at buildtime sed -e "s:/etc/fslversion:${S}/etc/fslversion:g" \ -i ${makefilelist} || die