| 1 |
commit: 709970547b89e4f52d32818b6835f649b721a87d |
| 2 |
Author: Sergey Torokhov <torokhov-s-a <AT> yandex <DOT> ru> |
| 3 |
AuthorDate: Sat Apr 24 09:37:38 2021 +0000 |
| 4 |
Commit: Theo Anderson <telans <AT> posteo <DOT> de> |
| 5 |
CommitDate: Sat Apr 24 09:37:38 2021 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=70997054 |
| 7 |
|
| 8 |
dev-libs/StringiFor: fix call gfortran directly, pass system LDFLAGS |
| 9 |
|
| 10 |
Closes: https://bugs.gentoo.org/784935 |
| 11 |
Closes: https://bugs.gentoo.org/780942 |
| 12 |
|
| 13 |
Signed-off-by: Sergey Torokhov <torokhov-s-a <AT> yandex.ru> |
| 14 |
|
| 15 |
dev-libs/StringiFor/StringiFor-1.1.1.ebuild | 14 +++++++------- |
| 16 |
1 file changed, 7 insertions(+), 7 deletions(-) |
| 17 |
|
| 18 |
diff --git a/dev-libs/StringiFor/StringiFor-1.1.1.ebuild b/dev-libs/StringiFor/StringiFor-1.1.1.ebuild |
| 19 |
index 8b223574e..65350be77 100644 |
| 20 |
--- a/dev-libs/StringiFor/StringiFor-1.1.1.ebuild |
| 21 |
+++ b/dev-libs/StringiFor/StringiFor-1.1.1.ebuild |
| 22 |
@@ -34,8 +34,7 @@ KEYWORDS="~amd64 ~x86" |
| 23 |
IUSE="static-libs test" |
| 24 |
RESTRICT="!test? ( test )" |
| 25 |
|
| 26 |
-DEPEND="dev-util/FoBiS" |
| 27 |
-BDEPEND="virtual/fortran" |
| 28 |
+BDEPEND="dev-util/FoBiS" |
| 29 |
|
| 30 |
PATCHES=( |
| 31 |
"${FILESDIR}/stringifor-1.1.1_fobos_soname.patch" |
| 32 |
@@ -48,7 +47,7 @@ set_build_mode() { |
| 33 |
BUILD_MODE_SHARED="-mode stringifor-shared-gnu" |
| 34 |
BUILD_MODE_STATIC="-mode stringifor-static-gnu" |
| 35 |
BUILD_MODE_TESTS="-mode tests-gnu" ;; |
| 36 |
- ifort ) |
| 37 |
+ *ifort* ) |
| 38 |
BUILD_MODE_SHARED="-mode stringifor-shared-intel" |
| 39 |
BUILD_MODE_STATIC="-mode stringifor-static-intel" |
| 40 |
BUILD_MODE_TESTS="-mode tests-intel" ;; |
| 41 |
@@ -68,16 +67,17 @@ src_prepare() { |
| 42 |
mv -T "${WORKDIR}"/PENF-"${PENF_sha}" "${S}"/src/third_party/PENF |
| 43 |
default |
| 44 |
|
| 45 |
- sed -i -e 's:\$OPTIMIZE = -O2:\$OPTIMIZE = '"${FFLAGS}"':' fobos || die |
| 46 |
+ sed -i -e 's:\$OPTIMIZE = -O2:\$OPTIMIZE = '"${FFLAGS}"':' \ |
| 47 |
+ -e '/^\$LSHARED/s:$: '"${LDFLAGS}"':' fobos || die |
| 48 |
} |
| 49 |
|
| 50 |
src_compile() { |
| 51 |
- FoBiS.py build -verbose ${BUILD_MODE_SHARED} |
| 52 |
- use static-libs && FoBiS.py build -verbose ${BUILD_MODE_STATIC} |
| 53 |
+ FoBiS.py build -verbose -compiler custom -fc $(tc-getFC) ${BUILD_MODE_SHARED} |
| 54 |
+ use static-libs && FoBiS.py build -verbose -compiler custom -fc $(tc-getFC) ${BUILD_MODE_STATIC} |
| 55 |
} |
| 56 |
|
| 57 |
src_test() { |
| 58 |
- FoBiS.py build ${BUILD_MODE_TESTS} |
| 59 |
+ FoBiS.py build -compiler custom -fc $(tc-getFC) ${BUILD_MODE_TESTS} |
| 60 |
for e in $( find ./exe/ -type f -executable -print ); do |
| 61 |
if [ "$e" != "./exe/stringifor_test_parse_large_csv" ] ; then |
| 62 |
echo " run test $e :" && $e |
Archives