From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 5B0461382C5 for ; Sat, 24 Apr 2021 23:19:58 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id B017DE0845; Sat, 24 Apr 2021 23:19:57 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 8E7D9E0844 for ; Sat, 24 Apr 2021 23:19:57 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 9118A3413D5 for ; Sat, 24 Apr 2021 23:19:51 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 285DB4C3 for ; Sat, 24 Apr 2021 23:19:41 +0000 (UTC) From: "Theo Anderson" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Theo Anderson" Message-ID: <1619257058.709970547b89e4f52d32818b6835f649b721a87d.telans@gentoo> Subject: [gentoo-commits] repo/proj/guru:master commit in: dev-libs/StringiFor/ X-VCS-Repository: repo/proj/guru X-VCS-Files: dev-libs/StringiFor/StringiFor-1.1.1.ebuild X-VCS-Directories: dev-libs/StringiFor/ X-VCS-Committer: telans X-VCS-Committer-Name: Theo Anderson X-VCS-Revision: 709970547b89e4f52d32818b6835f649b721a87d X-VCS-Branch: master Date: Sat, 24 Apr 2021 23:19:41 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: a2c8d094-02b7-4205-b3bf-4204c0449c5a X-Archives-Hash: f53c76f5f54141ad1cd19617f64eb910 commit: 709970547b89e4f52d32818b6835f649b721a87d Author: Sergey Torokhov yandex ru> AuthorDate: Sat Apr 24 09:37:38 2021 +0000 Commit: Theo Anderson posteo de> 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 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