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 05FCD15803E for ; Wed, 3 Jan 2024 18:12:49 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 2FBFC2BC017; Wed, 3 Jan 2024 18:12:48 +0000 (UTC) Received: from smtp.gentoo.org (woodpecker.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)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 122372BC017 for ; Wed, 3 Jan 2024 18:12:48 +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)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 1E447342FFA for ; Wed, 3 Jan 2024 18:12:47 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 90ECA99E for ; Wed, 3 Jan 2024 18:12:45 +0000 (UTC) From: "Andreas Sturmlechner" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Andreas Sturmlechner" Message-ID: <1704297301.72f4dff5d8ce757144b88e7a9c599c36c724c904.asturm@gentoo> Subject: [gentoo-commits] proj/qt:master commit in: eclass/ X-VCS-Repository: proj/qt X-VCS-Files: eclass/qt5-build.eclass X-VCS-Directories: eclass/ X-VCS-Committer: asturm X-VCS-Committer-Name: Andreas Sturmlechner X-VCS-Revision: 72f4dff5d8ce757144b88e7a9c599c36c724c904 X-VCS-Branch: master Date: Wed, 3 Jan 2024 18:12:45 +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: a9951ea9-536c-4e7f-b389-45e9ad743c0a X-Archives-Hash: 4243130c238364922124aa044ae33e6a commit: 72f4dff5d8ce757144b88e7a9c599c36c724c904 Author: Andreas Sturmlechner gentoo org> AuthorDate: Mon Jan 1 19:00:27 2024 +0000 Commit: Andreas Sturmlechner gentoo org> CommitDate: Wed Jan 3 15:55:01 2024 +0000 URL: https://gitweb.gentoo.org/proj/qt.git/commit/?id=72f4dff5 qt5-build.eclass: Move append-ldflags and filter-lto to src_prepare Bug: https://bugs.gentoo.org/919789 Signed-off-by: Andreas Sturmlechner gentoo.org> eclass/qt5-build.eclass | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/eclass/qt5-build.eclass b/eclass/qt5-build.eclass index 9561d918..60d525b3 100644 --- a/eclass/qt5-build.eclass +++ b/eclass/qt5-build.eclass @@ -179,6 +179,15 @@ fi qt5-build_src_prepare() { qt5_prepare_env + # Workaround for bug #915203 + # Upstream: https://bugreports.qt.io/browse/QTBUG-111514 + if [[ ${PN} != qtcore ]]; then + append-ldflags $(test-flags-CCLD -Wl,--undefined-version) + fi + + # many bugs, no one to fix (already done for qtbase) + filter-lto + if [[ ${QT5_BUILD_TYPE} == live ]] || [[ -n ${KDE_ORG_COMMIT} ]]; then if [[ -n ${KDE_ORG_COMMIT} ]]; then einfo "Preparing KDE Qt5PatchCollection snapshot at ${KDE_ORG_COMMIT}" @@ -231,15 +240,6 @@ qt5-build_src_configure() { qt5_tools_configure fi - # Workaround for bug #915203 - # Upstream: https://bugreports.qt.io/browse/QTBUG-111514 - if [[ ${PN} != qtcore ]]; then - append-ldflags $(test-flags-CCLD -Wl,--undefined-version) - fi - - # many bugs, no one to fix - filter-lto - qt5_foreach_target_subdir qt5_qmake }