commit:     4590f31ae7dabc26a98483768c051ea216f4466e
Author:     Alexander Tsoy <alexander <AT> tsoy <DOT> me>
AuthorDate: Tue Jan  2 00:17:49 2024 +0000
Commit:     Miroslav Šulc <fordfrog <AT> gentoo <DOT> org>
CommitDate: Wed Jan  3 08:43:37 2024 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4590f31a

media-sound/guitarix: fix LTO build

Pass --cxxflags to waf configure. This allows waf to do some magic and
append -ffat-lto-objects to CXXFLAGS.

Also unexport CXXFLAGS and LDFLAGS before waf configure to prevent duplicating
flags.

Closes: https://bugs.gentoo.org/860861
Signed-off-by: Alexander Tsoy <alexander <AT> tsoy.me>
Closes: https://github.com/gentoo/gentoo/pull/34597
Signed-off-by: Miroslav Šulc <fordfrog <AT> gentoo.org>

 media-sound/guitarix/guitarix-0.44.1.ebuild | 5 ++++-
 media-sound/guitarix/guitarix-9999.ebuild   | 5 ++++-
 2 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/media-sound/guitarix/guitarix-0.44.1.ebuild 
b/media-sound/guitarix/guitarix-0.44.1.ebuild
index 14885014cd74..60b76beb379f 100644
--- a/media-sound/guitarix/guitarix-0.44.1.ebuild
+++ b/media-sound/guitarix/guitarix-0.44.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 2019-2023 Gentoo Authors
+# Copyright 2019-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -69,7 +69,10 @@ PATCHES=(
 )
 
 src_configure() {
+       export -n {CXX,LD}FLAGS
+
        local myconf=(
+               --cxxflags="${CXXFLAGS}"
                --cxxflags-debug=""
                --cxxflags-release="-DNDEBUG"
                --ldflags="${LDFLAGS}"

diff --git a/media-sound/guitarix/guitarix-9999.ebuild 
b/media-sound/guitarix/guitarix-9999.ebuild
index 0f1305ac3816..ed2429d53f6d 100644
--- a/media-sound/guitarix/guitarix-9999.ebuild
+++ b/media-sound/guitarix/guitarix-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 2019-2023 Gentoo Authors
+# Copyright 2019-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -66,7 +66,10 @@ BDEPEND="
 DOCS=( changelog README )
 
 src_configure() {
+       export -n {CXX,LD}FLAGS
+
        local myconf=(
+               --cxxflags="${CXXFLAGS}"
                --cxxflags-debug=""
                --cxxflags-release="-DNDEBUG"
                --ldflags="${LDFLAGS}"

Reply via email to