[gentoo-dev] [PATCH] qmake-utils.eclass: Force QMAKE_*FLAGS_RELEASE_WITH_DEBUGINFO to blank

[gentoo-dev] [PATCH] qmake-utils.eclass: Force QMAKE_*FLAGS_RELEASE_WITH_DEBUGINFO to blank

[James Le Cuirot]

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@gentoo.org>
---
 eclass/qmake-utils.eclass | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/eclass/qmake-utils.eclass b/eclass/qmake-utils.eclass
index a86ce1fbabb8..49e7d5d15883 100644
--- a/eclass/qmake-utils.eclass
+++ b/eclass/qmake-utils.eclass
@@ -1,4 +1,4 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 # @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
 }
 
-- 
2.40.1