From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 8DFA6158089 for ; Fri, 22 Sep 2023 04:46:37 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id C02772BC014; Fri, 22 Sep 2023 04:46:36 +0000 (UTC) Received: from smtp.gentoo.org (dev.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id A703F2BC014 for ; Fri, 22 Sep 2023 04:46:36 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id CC59133BE62 for ; Fri, 22 Sep 2023 04:46:35 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 490E111D4 for ; Fri, 22 Sep 2023 04:46:34 +0000 (UTC) From: "Ionen Wolkens" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Ionen Wolkens" Message-ID: <1695357876.97a0c80e59f2a6770d73518d44d0a481e845e822.ionen@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: dev-qt/qtwebengine/ X-VCS-Repository: repo/gentoo X-VCS-Files: dev-qt/qtwebengine/qtwebengine-6.5.2-r1.ebuild dev-qt/qtwebengine/qtwebengine-6.5.9999.ebuild dev-qt/qtwebengine/qtwebengine-6.6.9999.ebuild dev-qt/qtwebengine/qtwebengine-6.9999.ebuild X-VCS-Directories: dev-qt/qtwebengine/ X-VCS-Committer: ionen X-VCS-Committer-Name: Ionen Wolkens X-VCS-Revision: 97a0c80e59f2a6770d73518d44d0a481e845e822 X-VCS-Branch: master Date: Fri, 22 Sep 2023 04:46:34 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: d3c07086-5f39-4b68-be55-a0aa676740ed X-Archives-Hash: 616a618af1a8ba0e98d8733de4efdd8b commit: 97a0c80e59f2a6770d73518d44d0a481e845e822 Author: Ionen Wolkens gentoo org> AuthorDate: Fri Sep 22 04:13:06 2023 +0000 Commit: Ionen Wolkens gentoo 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 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"