Gentoo Archives: gentoo-commits

From: "Michał Górny" <mgorny@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/proj/guru:master commit in: dev-libs/ftl/
Date: Thu, 29 Apr 2021 08:23:35
Message-Id: 1619645115.60f15dba6835d3ec1b703a7d4d375df05a8fa6c7.mgorny@gentoo
1 commit: 60f15dba6835d3ec1b703a7d4d375df05a8fa6c7
2 Author: Sergey Torokhov <torokhov-s-a <AT> yandex <DOT> ru>
3 AuthorDate: Wed Apr 28 21:19:38 2021 +0000
4 Commit: Michał Górny <mgorny <AT> gentoo <DOT> org>
5 CommitDate: Wed Apr 28 21:25:15 2021 +0000
6 URL: https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=60f15dba
7
8 dev-libs/ftl: fix FLAGS (i.e. FCFLAGS) reassigning, pass CXXFLAGS
9
10 Closes: https://bugs.gentoo.org/785745
11
12 Signed-off-by: Sergey Torokhov <torokhov-s-a <AT> yandex.ru>
13
14 dev-libs/ftl/ftl-1.0_p20210308.ebuild | 5 ++++-
15 1 file changed, 4 insertions(+), 1 deletion(-)
16
17 diff --git a/dev-libs/ftl/ftl-1.0_p20210308.ebuild b/dev-libs/ftl/ftl-1.0_p20210308.ebuild
18 index 6981da492..214f8876e 100644
19 --- a/dev-libs/ftl/ftl-1.0_p20210308.ebuild
20 +++ b/dev-libs/ftl/ftl-1.0_p20210308.ebuild
21 @@ -55,11 +55,14 @@ src_prepare() {
22 ;;
23 esac
24
25 - # Replase install PREFIX, LIBDIR, add library soname
26 + # Replase BUILD type, PREFIX and libdir, LIBDIR, add libsoname and LDFLAGS,
27 + # drop FLAGS reassign block, add CXXFLAGS to 'configure_ftlRegex.c' build
28 sed -i -e '/^BUILD ?=/s:debug:release:' \
29 -e 's:PREFIX ?= /usr/local:PREFIX ?= '"${ED}"'/usr/:' \
30 -e 's:(PREFIX)/lib:(PREFIX)/'"$(get_libdir)"':' \
31 -e 's:SOLDFLAGS = -shared:SOLDFLAGS = -shared -Wl,-soname=libftl.so.1 '"${LDFLAGS}"':' \
32 + -e '/gnudebug)/,+15d' \
33 + -e '/configure_ftlRegex.c/ s:\$(CXXCOMPILER):\$(CXXCOMPILER) \$(CXXFLAGS):' \
34 makefile || die
35 }