[gentoo-commits] repo/gentoo:master commit in: eclass/

[Andreas Sturmlechner]

commit:     844eff16165fe6b551f6dc5ba3f7c4cb6cc21cc3
Author:     James Le Cuirot <chewi <AT> gentoo <DOT> org>
AuthorDate: Sun Jun  4 16:18:12 2023 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Sun Jun 11 17:34:16 2023 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=844eff16

qmake-utils.eclass: Force QMAKE_*FLAGS_RELEASE_WITH_DEBUGINFO to blank

These variables are usually defined as:

    $ fgrep RELEASE_WITH_DEBUGINFO /usr/lib64/qt5/mkspecs/common/gcc-base.conf
    QMAKE_CFLAGS_RELEASE_WITH_DEBUGINFO += $$QMAKE_CFLAGS_OPTIMIZE -g
    QMAKE_CXXFLAGS_RELEASE_WITH_DEBUGINFO += 
$$QMAKE_CFLAGS_RELEASE_WITH_DEBUGINFO
    QMAKE_LFLAGS_RELEASE_WITH_DEBUGINFO +=

They can take precedence over our provided flags, so they need to be
blanked out. They are normally only used when the user specifies
-force-debug-info, but sometimes upstreams enable this themselves.

Signed-off-by: James Le Cuirot <chewi <AT> gentoo.org>
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>

 eclass/qmake-utils.eclass | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/eclass/qmake-utils.eclass b/eclass/qmake-utils.eclass
index 98325d525c09..051bb5c658ca 100644
--- a/eclass/qmake-utils.eclass
+++ b/eclass/qmake-utils.eclass
@@ -78,12 +78,15 @@ qt5_get_qmake_args() {
                QMAKE_CFLAGS="${CFLAGS}"
                QMAKE_CFLAGS_RELEASE=
                QMAKE_CFLAGS_DEBUG=
+               QMAKE_CFLAGS_RELEASE_WITH_DEBUGINFO=
                QMAKE_CXXFLAGS="${CXXFLAGS}"
                QMAKE_CXXFLAGS_RELEASE=
                QMAKE_CXXFLAGS_DEBUG=
+               QMAKE_CXXFLAGS_RELEASE_WITH_DEBUGINFO=
                QMAKE_LFLAGS="${LDFLAGS}"
                QMAKE_LFLAGS_RELEASE=
                QMAKE_LFLAGS_DEBUG=
+               QMAKE_LFLAGS_RELEASE_WITH_DEBUGINFO=
        EOF
 }