commit: 97a0c80e59f2a6770d73518d44d0a481e845e822 Author: Ionen Wolkens <ionen <AT> gentoo <DOT> org> AuthorDate: Fri Sep 22 04:13:06 2023 +0000 Commit: Ionen Wolkens <ionen <AT> gentoo <DOT> org> CommitDate: Fri Sep 22 04:44:36 2023 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=97a0c80e
dev-qt/qtwebengine: replace -g3+ for -g unless custom-cflags (qt6) On second thought let's do this, but keep a warning that mentions USE=custom-cflags given users may not be used to -g* getting replaced and then lacking the symbols they were expecting. Not going to keep disk space / memory usage updated for -g as estimates would likely be all over the place and consider that the warning is sufficient there. Not using a full replace-flags '-g*' -g to allow e.g. a package.env that adds -g0/-g1 at the end to still work while disregaring the warning without implementing extra logic. Note that have not retried -g to be sure it is fine, albeit pretty sure it was fine last time tried. Worst case could replace by -g1, or drop flags-respecting-patches and request debugging symbols to gn instead (selectively forces -g1 even if asked for more). Closes: https://bugs.gentoo.org/914475 Signed-off-by: Ionen Wolkens <ionen <AT> gentoo.org> dev-qt/qtwebengine/qtwebengine-6.5.2-r1.ebuild | 10 ++++++++-- dev-qt/qtwebengine/qtwebengine-6.5.9999.ebuild | 10 ++++++++-- dev-qt/qtwebengine/qtwebengine-6.6.9999.ebuild | 10 ++++++++-- dev-qt/qtwebengine/qtwebengine-6.9999.ebuild | 10 ++++++++-- 4 files changed, 32 insertions(+), 8 deletions(-) diff --git a/dev-qt/qtwebengine/qtwebengine-6.5.2-r1.ebuild b/dev-qt/qtwebengine/qtwebengine-6.5.2-r1.ebuild index 90835addd93b..fd862d5b141f 100644 --- a/dev-qt/qtwebengine/qtwebengine-6.5.2-r1.ebuild +++ b/dev-qt/qtwebengine/qtwebengine-6.5.2-r1.ebuild @@ -119,7 +119,6 @@ qtwebengine_check-reqs() { ewarn "when using more expensive debug symbols (e.g. -ggdb3 rather than -g)." ewarn ewarn "If run into issues, please try disabling before reporting a bug." - ewarn fi local CHECKREQS_DISK_BUILD=7G @@ -214,7 +213,14 @@ src_configure() { rtc_link_pipewire=true ) - use custom-cflags || strip-flags # fragile + if use !custom-cflags; then + strip-flags # fragile + + if is-flagq '-g?(gdb)?([3-9])'; then #914475 + replace-flags '-g?(gdb)?([3-9])' -g + ewarn "-g3+/-ggdb* *FLAGS replaced by -g, enable USE=custom-cflags to keep." + fi + fi export NINJA NINJAFLAGS=$(get_NINJAOPTS) [[ ${NINJA_VERBOSE^^} == OFF ]] || NINJAFLAGS+=" -v" diff --git a/dev-qt/qtwebengine/qtwebengine-6.5.9999.ebuild b/dev-qt/qtwebengine/qtwebengine-6.5.9999.ebuild index e844d475fc12..8435e3c7491d 100644 --- a/dev-qt/qtwebengine/qtwebengine-6.5.9999.ebuild +++ b/dev-qt/qtwebengine/qtwebengine-6.5.9999.ebuild @@ -120,7 +120,6 @@ qtwebengine_check-reqs() { ewarn "when using more expensive debug symbols (e.g. -ggdb3 rather than -g)." ewarn ewarn "If run into issues, please try disabling before reporting a bug." - ewarn fi local CHECKREQS_DISK_BUILD=7G @@ -215,7 +214,14 @@ src_configure() { rtc_link_pipewire=true ) - use custom-cflags || strip-flags # fragile + if use !custom-cflags; then + strip-flags # fragile + + if is-flagq '-g?(gdb)?([3-9])'; then #914475 + replace-flags '-g?(gdb)?([3-9])' -g + ewarn "-g3+/-ggdb* *FLAGS replaced by -g, enable USE=custom-cflags to keep." + fi + fi export NINJA NINJAFLAGS=$(get_NINJAOPTS) [[ ${NINJA_VERBOSE^^} == OFF ]] || NINJAFLAGS+=" -v" diff --git a/dev-qt/qtwebengine/qtwebengine-6.6.9999.ebuild b/dev-qt/qtwebengine/qtwebengine-6.6.9999.ebuild index d21b26363aa2..7a3630279acb 100644 --- a/dev-qt/qtwebengine/qtwebengine-6.6.9999.ebuild +++ b/dev-qt/qtwebengine/qtwebengine-6.6.9999.ebuild @@ -126,7 +126,6 @@ qtwebengine_check-reqs() { ewarn "when using more expensive debug symbols (e.g. -ggdb3 rather than -g)." ewarn ewarn "If run into issues, please try disabling before reporting a bug." - ewarn fi local CHECKREQS_DISK_BUILD=7G @@ -225,7 +224,14 @@ src_configure() { rtc_link_pipewire=true ) - use custom-cflags || strip-flags # fragile + if use !custom-cflags; then + strip-flags # fragile + + if is-flagq '-g?(gdb)?([3-9])'; then #914475 + replace-flags '-g?(gdb)?([3-9])' -g + ewarn "-g3+/-ggdb* *FLAGS replaced by -g, enable USE=custom-cflags to keep." + fi + fi export NINJA NINJAFLAGS=$(get_NINJAOPTS) [[ ${NINJA_VERBOSE^^} == OFF ]] || NINJAFLAGS+=" -v" diff --git a/dev-qt/qtwebengine/qtwebengine-6.9999.ebuild b/dev-qt/qtwebengine/qtwebengine-6.9999.ebuild index 89e31598639c..b09d7c0d0f18 100644 --- a/dev-qt/qtwebengine/qtwebengine-6.9999.ebuild +++ b/dev-qt/qtwebengine/qtwebengine-6.9999.ebuild @@ -126,7 +126,6 @@ qtwebengine_check-reqs() { ewarn "when using more expensive debug symbols (e.g. -ggdb3 rather than -g)." ewarn ewarn "If run into issues, please try disabling before reporting a bug." - ewarn fi local CHECKREQS_DISK_BUILD=7G @@ -225,7 +224,14 @@ src_configure() { rtc_link_pipewire=true ) - use custom-cflags || strip-flags # fragile + if use !custom-cflags; then + strip-flags # fragile + + if is-flagq '-g?(gdb)?([3-9])'; then #914475 + replace-flags '-g?(gdb)?([3-9])' -g + ewarn "-g3+/-ggdb* *FLAGS replaced by -g, enable USE=custom-cflags to keep." + fi + fi export NINJA NINJAFLAGS=$(get_NINJAOPTS) [[ ${NINJA_VERBOSE^^} == OFF ]] || NINJAFLAGS+=" -v"
