public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed
From: "Sergey Torokhov" <torokhov-s-a@yandex.ru>
To: gentoo-commits@lists.gentoo.org
Subject: [gentoo-commits] repo/proj/guru:dev commit in: dev-libs/ftl/
Date: Wed, 28 Apr 2021 21:25:29 +0000 (UTC)	[thread overview]
Message-ID: <1619645115.60f15dba6835d3ec1b703a7d4d375df05a8fa6c7.SergeyTorokhov@gentoo> (raw)

commit:     60f15dba6835d3ec1b703a7d4d375df05a8fa6c7
Author:     Sergey Torokhov <torokhov-s-a <AT> yandex <DOT> ru>
AuthorDate: Wed Apr 28 21:19:38 2021 +0000
Commit:     Sergey Torokhov <torokhov-s-a <AT> yandex <DOT> ru>
CommitDate: Wed Apr 28 21:25:15 2021 +0000
URL:        https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=60f15dba

dev-libs/ftl: fix FLAGS (i.e. FCFLAGS) reassigning, pass CXXFLAGS

Closes: https://bugs.gentoo.org/785745

Signed-off-by: Sergey Torokhov <torokhov-s-a <AT> yandex.ru>

 dev-libs/ftl/ftl-1.0_p20210308.ebuild | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/dev-libs/ftl/ftl-1.0_p20210308.ebuild b/dev-libs/ftl/ftl-1.0_p20210308.ebuild
index 6981da492..214f8876e 100644
--- a/dev-libs/ftl/ftl-1.0_p20210308.ebuild
+++ b/dev-libs/ftl/ftl-1.0_p20210308.ebuild
@@ -55,11 +55,14 @@ src_prepare() {
 			;;
 	esac
 
-	# Replase install PREFIX, LIBDIR, add library soname
+	# Replase BUILD type, PREFIX and libdir, LIBDIR, add libsoname and LDFLAGS,
+	# drop FLAGS reassign block, add CXXFLAGS to 'configure_ftlRegex.c' build
 	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}"':' \
+		-e '/gnudebug)/,+15d' \
+		-e '/configure_ftlRegex.c/ s:\$(CXXCOMPILER):\$(CXXCOMPILER) \$(CXXFLAGS):' \
 		makefile || die
 }
 


             reply	other threads:[~2021-04-28 21:25 UTC|newest]

Thread overview: 8+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2021-04-28 21:25 Sergey Torokhov [this message]
  -- strict thread matches above, loose matches on Subject: below --
2023-06-02 21:06 [gentoo-commits] repo/proj/guru:dev commit in: dev-libs/ftl/ Sergey Torokhov
2023-05-16 21:56 Sergey Torokhov
2022-03-06 23:11 Sergey Torokhov
2022-03-06 23:11 Sergey Torokhov
2022-02-09 13:12 Anna Vyalkova
2021-04-26 19:32 Sergey Torokhov
2021-04-25 13:41 Sergey Torokhov

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1619645115.60f15dba6835d3ec1b703a7d4d375df05a8fa6c7.SergeyTorokhov@gentoo \
    --to=torokhov-s-a@yandex.ru \
    --cc=gentoo-commits@lists.gentoo.org \
    --cc=gentoo-dev@lists.gentoo.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox