commit: 709970547b89e4f52d32818b6835f649b721a87d Author: Sergey Torokhov <torokhov-s-a <AT> yandex <DOT> ru> AuthorDate: Sat Apr 24 09:37:38 2021 +0000 Commit: Sergey Torokhov <torokhov-s-a <AT> yandex <DOT> ru> CommitDate: Sat Apr 24 09:37:38 2021 +0000 URL: https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=70997054
dev-libs/StringiFor: fix call gfortran directly, pass system LDFLAGS Closes: https://bugs.gentoo.org/784935 Closes: https://bugs.gentoo.org/780942 Signed-off-by: Sergey Torokhov <torokhov-s-a <AT> yandex.ru> dev-libs/StringiFor/StringiFor-1.1.1.ebuild | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/dev-libs/StringiFor/StringiFor-1.1.1.ebuild b/dev-libs/StringiFor/StringiFor-1.1.1.ebuild index 8b223574e..65350be77 100644 --- a/dev-libs/StringiFor/StringiFor-1.1.1.ebuild +++ b/dev-libs/StringiFor/StringiFor-1.1.1.ebuild @@ -34,8 +34,7 @@ KEYWORDS="~amd64 ~x86" IUSE="static-libs test" RESTRICT="!test? ( test )" -DEPEND="dev-util/FoBiS" -BDEPEND="virtual/fortran" +BDEPEND="dev-util/FoBiS" PATCHES=( "${FILESDIR}/stringifor-1.1.1_fobos_soname.patch" @@ -48,7 +47,7 @@ set_build_mode() { BUILD_MODE_SHARED="-mode stringifor-shared-gnu" BUILD_MODE_STATIC="-mode stringifor-static-gnu" BUILD_MODE_TESTS="-mode tests-gnu" ;; - ifort ) + *ifort* ) BUILD_MODE_SHARED="-mode stringifor-shared-intel" BUILD_MODE_STATIC="-mode stringifor-static-intel" BUILD_MODE_TESTS="-mode tests-intel" ;; @@ -68,16 +67,17 @@ src_prepare() { mv -T "${WORKDIR}"/PENF-"${PENF_sha}" "${S}"/src/third_party/PENF default - sed -i -e 's:\$OPTIMIZE = -O2:\$OPTIMIZE = '"${FFLAGS}"':' fobos || die + sed -i -e 's:\$OPTIMIZE = -O2:\$OPTIMIZE = '"${FFLAGS}"':' \ + -e '/^\$LSHARED/s:$: '"${LDFLAGS}"':' fobos || die } src_compile() { - FoBiS.py build -verbose ${BUILD_MODE_SHARED} - use static-libs && FoBiS.py build -verbose ${BUILD_MODE_STATIC} + FoBiS.py build -verbose -compiler custom -fc $(tc-getFC) ${BUILD_MODE_SHARED} + use static-libs && FoBiS.py build -verbose -compiler custom -fc $(tc-getFC) ${BUILD_MODE_STATIC} } src_test() { - FoBiS.py build ${BUILD_MODE_TESTS} + FoBiS.py build -compiler custom -fc $(tc-getFC) ${BUILD_MODE_TESTS} for e in $( find ./exe/ -type f -executable -print ); do if [ "$e" != "./exe/stringifor_test_parse_large_csv" ] ; then echo " run test $e :" && $e
