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 A9CCB1382C5 for ; Mon, 26 Apr 2021 19:32:13 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 0DAAAE0891; Mon, 26 Apr 2021 19:32:13 +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 EA5C4E0891 for ; Mon, 26 Apr 2021 19:32:12 +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 AA48B34143C for ; Mon, 26 Apr 2021 19:32:09 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 380C3478 for ; Mon, 26 Apr 2021 19:32:08 +0000 (UTC) From: "Sergey Torokhov" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Sergey Torokhov" Message-ID: <1619465487.2ea4fa55f156bce9991c13ac5c0024af2364ebc2.SergeyTorokhov@gentoo> Subject: [gentoo-commits] repo/proj/guru:dev commit in: dev-libs/ftl/ X-VCS-Repository: repo/proj/guru X-VCS-Files: dev-libs/ftl/ftl-1.0_p20210308.ebuild X-VCS-Directories: dev-libs/ftl/ X-VCS-Committer: SergeyTorokhov X-VCS-Committer-Name: Sergey Torokhov X-VCS-Revision: 2ea4fa55f156bce9991c13ac5c0024af2364ebc2 X-VCS-Branch: dev Date: Mon, 26 Apr 2021 19:32:08 +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: 83331cb2-7ecf-480f-aa14-b2393b36c454 X-Archives-Hash: 258045ab7c6c2d4da60e844d2e053391 commit: 2ea4fa55f156bce9991c13ac5c0024af2364ebc2 Author: Sergey Torokhov yandex ru> AuthorDate: Mon Apr 26 19:26:16 2021 +0000 Commit: Sergey Torokhov yandex ru> CommitDate: Mon Apr 26 19:31:27 2021 +0000 URL: https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=2ea4fa55 dev-libs/ftl: fix intall build type as release instead of debug As make options were not passed on install phase it recompiled library in as BUILD=debug mode instead of 'release'. Also gfortran command called directly as on install phase it wasn't passed into make command. Now build type and some other parameters passed in src_prepare instead of src_compile and src_insall. Closes: https://bugs.gentoo.org/785739 Signed-off-by: Sergey Torokhov yandex.ru> dev-libs/ftl/ftl-1.0_p20210308.ebuild | 35 ++++++++++++++++++++++++++--------- 1 file changed, 26 insertions(+), 9 deletions(-) diff --git a/dev-libs/ftl/ftl-1.0_p20210308.ebuild b/dev-libs/ftl/ftl-1.0_p20210308.ebuild index 4cdbc8837..6981da492 100644 --- a/dev-libs/ftl/ftl-1.0_p20210308.ebuild +++ b/dev-libs/ftl/ftl-1.0_p20210308.ebuild @@ -34,10 +34,33 @@ pkg_setup() { src_prepare() { default + case $(tc-getFC) in + *gfortran* ) + sed -i -e '/gnu)/,/COMPILER =/ s:gfortran:'"$(tc-getFC)"':' \ + -e '/gnu)/,/^\tFLAGS =/ s:(BUILDDIR):(BUILDDIR) '"${FCFLAGS}"':' \ + -e '/gnu)/,/CXXCOMPILER =/ s:g++:'"$(tc-getCXX)"':' \ + -e '/gnu)/,/CXXFLAGS =/ s:CXXFLAGS = .*:CXXFLAGS = '"${CXXFLAGS}"':' \ + makefile || die + ;; + *ifort* ) + sed -i -e '/^PLATFORM/ s:gnu:intel:' \ + -e '/intel)/,/COMPILER =/ s:ifort:'"$(tc-getFC)"':' \ + -e '/intel)/,/^\tFLAGS =/ s:(BUILDDIR):(BUILDDIR) '"${FCFLAGS}"':' \ + -e '/intel)/,/CXXCOMPILER =/ s:g++:'"$(tc-getCXX)"':' \ + -e '/intel)/,/CXXFLAGS =/ s:CXXFLAGS = .*:CXXFLAGS = '"${CXXFLAGS}"':' \ + makefile || die + ;; + * ) + die "Sorry, GNU gfortran or Intel ifort are currently supported in the ebuild" + ;; + esac + # Replase install PREFIX, LIBDIR, add library soname - sed -i -e 's:PREFIX ?= /usr/local:PREFIX ?= '"${ED}"'/usr/:' \ + sed -i -e '/^BUILD ?=/s:debug:release:' \ + -e 's:PREFIX ?= /usr/local:PREFIX ?= '"${ED}"'/usr/:' \ -e 's:(PREFIX)/lib:(PREFIX)/'"$(get_libdir)"':' \ - -e 's:SOLDFLAGS = -shared:SOLDFLAGS = -shared -Wl,-soname=libftl.so.1 '"${LDFLAGS}"':' makefile || die + -e 's:SOLDFLAGS = -shared:SOLDFLAGS = -shared -Wl,-soname=libftl.so.1 '"${LDFLAGS}"':' \ + makefile || die } src_configure() { @@ -45,13 +68,7 @@ src_configure() { } src_compile() { - emake \ - BUILD=release \ - USE_PCRE=$(usex pcre true false) \ - COMPILER="$(tc-getFC)" \ - FLAGS="${FCFLAGS}" \ - CXXCOMPILER="$(tc-getCXX)" \ - CXXFLAGS="${CXXFLAGS}" + emake USE_PCRE=$(usex pcre true false) } src_test() {