commit: 4896a20cd4bafc0f724f739e03a455260d17fe6c Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> AuthorDate: Mon Jan 1 19:00:27 2024 +0000 Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> CommitDate: Wed Jan 10 11:00:52 2024 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4896a20c
qt5-build.eclass: Move append-ldflags and filter-lto to src_prepare Closes: https://bugs.gentoo.org/919789 Signed-off-by: Andreas Sturmlechner <asturm <AT> 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 0e416e253cc2..76a089b2908d 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 + 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 }
