commit: 2ea4fa55f156bce9991c13ac5c0024af2364ebc2 Author: Sergey Torokhov <torokhov-s-a <AT> yandex <DOT> ru> AuthorDate: Mon Apr 26 19:26:16 2021 +0000 Commit: Sergey Torokhov <torokhov-s-a <AT> yandex <DOT> 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 <torokhov-s-a <AT> 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() {
